Merge branch 'matplotlib:main' into shuffleFix

Author: tybeller

doc/users/faq/howto_faq.rst

@@ -187,7 +187,7 @@ multiple ways to fix this:
   - tight layout (:doc:`/tutorials/intermediate/tight_layout_guide`)
 
 - Calculate good values from the size of the plot elements yourself
-  (:doc:`/gallery/pyplots/auto_subplots_adjust`)
+  (:doc:`/gallery/subplots_axes_and_figures/auto_subplots_adjust`)
 
 .. _howto-align-label:
 
@@ -203,8 +203,8 @@ 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
+.. 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
 

examples/pyplots/fig_x.py examples/misc/fig_x.pyexamples/pyplots/fig_x.py renamed to 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

examples/pyplots/boxplot_demo_pyplot.py

@@ -5,10 +5,15 @@
 
 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()
 

examples/pyplots/fig_axes_labels_simple.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

examples/pyplots/pyplot_formatstr.py

@@ -12,6 +12,7 @@
 import numpy as np
 import matplotlib.pyplot as plt
 import matplotlib.colors as mcolors
+from matplotlib.patches import Rectangle
 
 # Fixing random state for reproducibility
 np.random.seed(19680801)
@@ -65,8 +66,11 @@ def plot_colored_circles(ax, prng, nb_samples=15):
     for sty_dict, j in zip(plt.rcParams['axes.prop_cycle'], range(nb_samples)):
         ax.add_patch(plt.Circle(prng.normal(scale=3, size=2),
                                 radius=1.0, color=sty_dict['color']))
-    # Force the limits to be the same across the styles (because different
-    # styles may have different numbers of available colors).
+    ax.grid(visible=True)
+
+    # Add title for enabling grid
+    plt.title('ax.grid(True)', family='monospace', fontsize='small')
+
     ax.set_xlim([-4, 8])
     ax.set_ylim([-5, 6])
     ax.set_aspect('equal', adjustable='box')  # to plot circles as circles
@@ -91,6 +95,7 @@ def plot_histograms(ax, prng, nb_samples=10000):
         values = prng.beta(a, b, size=nb_samples)
         ax.hist(values, histtype="stepfilled", bins=30,
                 alpha=0.8, density=True)
+
     # Add a small annotation.
     ax.annotate('Annotation', xy=(0.25, 4.25),
                 xytext=(0.9, 0.9), textcoords=ax.transAxes,
@@ -110,7 +115,7 @@ def plot_figure(style_label=""):
     prng = np.random.RandomState(96917002)
 
     fig, axs = plt.subplots(ncols=6, nrows=1, num=style_label,
-                            figsize=(14.8, 2.7), constrained_layout=True)
+                            figsize=(14.8, 2.8), constrained_layout=True)
 
     # make a suptitle, in the same style for all subfigures,
     # except those with dark backgrounds, which get a lighter color:
@@ -126,10 +131,15 @@ def plot_figure(style_label=""):
     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_lines(axs[4])
-    plot_histograms(axs[5], prng)
+    plot_colored_lines(axs[3])
+    plot_histograms(axs[4], prng)
+    plot_colored_circles(axs[5], prng)
+
+    # add divider
+    rec = Rectangle((1 + 0.025, -2), 0.05, 16,
+                    clip_on=False, color='gray')
 
+    axs[4].add_artist(rec)
 
 if __name__ == "__main__":
 

examples/pyplots/pyplot_simple.py

@@ -36,6 +36,8 @@
 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