DOC: fix the guide handling of rcParams

jklymak · jklymak · commit 1adfa9d9ada4 · 2022-05-31T14:26:58.000+02:00
diff --git a/lib/matplotlib/_constrained_layout.py b/lib/matplotlib/_constrained_layout.py
@@ -107,7 +107,7 @@ def do_constrained_layout(fig, h_pad, w_pad,
                            ' "figure" keyword')
         return
 
-    for _ in range(2):
+    for itt in range(2):
         # do the algorithm twice.  This has to be done because decorations
         # change size after the first re-position (i.e. x/yticklabels get
         # larger/smaller).  This second reposition tends to be much milder,
@@ -134,7 +134,7 @@ def do_constrained_layout(fig, h_pad, w_pad,
         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:
+            if compress and (itt == 1):
                 layoutgrids = compress_fixed_aspect(layoutgrids, fig)
                 layoutgrids[fig].update_variables()
                 if check_no_collapsed_axes(layoutgrids, fig):
diff --git a/tutorials/intermediate/constrainedlayout_guide.py b/tutorials/intermediate/constrainedlayout_guide.py
@@ -332,7 +332,8 @@ def example_plot(ax, fontsize=12, hide_labels=False):
 #
 # 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 +347,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 +374,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)
 
@@ -398,7 +399,7 @@ def example_plot(ax, fontsize=12, hide_labels=False):
 # 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()
+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)
@@ -421,7 +422,7 @@ def example_plot(ax, fontsize=12, hide_labels=False):
 # Rather than using subgridspecs, Matplotlib now provides `~.Figure.subfigures`
 # which also work with ``constrained_layout``:
 
-fig = plt.figure()
+fig = plt.figure(layout="constrained")
 sfigs = fig.subfigures(1, 2, width_ratios=[1, 2])
 
 axs_left = sfigs[0].subplots(2, 1)
@@ -446,7 +447,7 @@ def example_plot(ax, fontsize=12, hide_labels=False):
 # 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])
 
@@ -462,7 +463,7 @@ def example_plot(ax, fontsize=12, hide_labels=False):
 # 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')
+                        sharex=True, sharey=True, layout="constrained")
 for ax in axs.flat:
     ax.imshow(arr)
 fig.suptitle("fixed-aspect plots, layout='constrained'")
@@ -507,7 +508,7 @@ def example_plot(ax, fontsize=12, hide_labels=False):
 # `.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)
@@ -522,7 +523,7 @@ def example_plot(ax, fontsize=12, hide_labels=False):
 ###############################################################################
 # 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)
@@ -538,7 +539,7 @@ def example_plot(ax, fontsize=12, hide_labels=False):
 # `~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)
