Mods from review

jklymak · jklymak · commit 8175f87058fa · 2022-03-24T14:59:55.000+01:00
diff --git a/lib/matplotlib/_constrained_layout.py b/lib/matplotlib/_constrained_layout.py
@@ -263,25 +263,27 @@ def compress_fixed_aspect(layoutgrids, fig):
             ax.apply_aspect()
             sub = ax.get_subplotspec()
             gs = sub.get_gridspec()
-            if gs not in extraw.keys():
+            if gs not in extraw:
                 extraw[gs] = np.zeros(gs.ncols)
                 extrah[gs] = np.zeros(gs.nrows)
             orig = ax.get_position(original=True)
             actual = ax.get_position(original=False)
             dw = orig.width - actual.width
             if dw > 0:
-                for i in sub.colspan:
-                    extraw[gs][i] = max(extraw[gs][i], dw)
+                extraw[gs][sub.colspan] = np.maximum(extraw[gs][sub.colspan],
+                                                     dw)
             dh = orig.height - actual.height
             if dh > 0:
-                for i in sub.rowspan:
-                    extrah[gs][i] = max(extrah[gs][i], dh)
+                extrah[gs][sub.rowspan] = np.maximum(extrah[gs][sub.rowspan],
+                                                     dh)
 
-    layoutgrids[fig].edit_margin_min('left', np.sum(extraw[gs]) / 2)
-    layoutgrids[fig].edit_margin_min('right', np.sum(extraw[gs]) / 2)
+    w = np.sum(extraw[gs]) / 2
+    layoutgrids[fig].edit_margin_min('left', w)
+    layoutgrids[fig].edit_margin_min('right', w)
 
-    layoutgrids[fig].edit_margin_min('top', np.sum(extrah[gs]) / 2)
-    layoutgrids[fig].edit_margin_min('bottom', np.sum(extrah[gs]) / 2)
+    h = np.sum(extrah[gs]) / 2
+    layoutgrids[fig].edit_margin_min('top', h)
+    layoutgrids[fig].edit_margin_min('bottom', h)
     return layoutgrids
 
 
diff --git a/lib/matplotlib/figure.py b/lib/matplotlib/figure.py
@@ -2336,7 +2336,7 @@ def set_layout_engine(self, layout=None, **kwargs):
         ----------
         layout: {'constrained', 'compressed', 'tight'} or `~.LayoutEngine`
             'constrained' will use `~.ConstrainedLayoutEngine`,
-            'compressed', will also use ConstrainedLayoutEngine, but with a
+            'compressed' will also use ConstrainedLayoutEngine, but with a
             correction that attempts to make a good layout for fixed-aspect
             ratio Axes. 'tight' uses `~.TightLayoutEngine`.  Users and
             libraries can define their own layout engines as well.
diff --git a/tutorials/intermediate/constrainedlayout_guide.py b/tutorials/intermediate/constrainedlayout_guide.py
@@ -325,7 +325,7 @@ def example_plot(ax, fontsize=12, hide_labels=False):
 # =================
 #
 # constrained_layout is meant to be used
-# with :func:`~matplotlib.figure.Figure.subplots`
+# with :func:`~matplotlib.figure.Figure.subplots`,
 # :func:`~matplotlib.figure.Figure.subplot_mosaic`, or
 # :func:`~matplotlib.gridspec.GridSpec` with
 # :func:`~matplotlib.figure.Figure.add_subplot`.
@@ -457,11 +457,11 @@ def example_plot(ax, fontsize=12, hide_labels=False):
 # =====================================================
 #
 #
-# By default, ``constrained_layout`` acts on the total size of an axes, but
-# when Axes have fixed aspect ratios, one side is made shorter.  For a grid
-# of such Axes, this leaves a large gap in the shortened direction. For
-# instance in the following the Axes are sqaure, but the figure quite wide
-# so there is a horizontal gap:
+# By default, ``constrained_layout`` acts on the original position of an axes.
+# However, when Axes have fixed aspect ratios, one side is made shorter.  For
+# a grid of such Axes, this can leave a large gap 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')
