Factor out the final 'clamp by the maximum size' step that was in every individual size suggestion algo. w3c#4901

Author: tabatkins

css-flexbox-1/Overview.bs

@@ -978,6 +978,7 @@ Automatic Minimum Size of Flex Items</h3>
 	is the smaller of its <a>content size suggestion</a> and its <a>transferred size suggestion</a>.
 	If the box has neither a <a>specified size suggestion</a> nor an [=preferred aspect ratio|aspect ratio=],
 	its <a>content-based minimum size</a> is the <a>content size suggestion</a>.
+	In all cases, the size is clamped by the [=maximum size|maximum=] [=main size=] if it's <a>definite</a>.
 
 	The <a>content size suggestion</a>, <a>specified size suggestion</a>, and <a>transferred size suggestion</a>
 	used in this calculation account for the relevant min/max/preferred size properties
@@ -988,8 +989,7 @@ Automatic Minimum Size of Flex Items</h3>
 		<dt><dfn>specified size suggestion</dfn>
 		<dd>
 			If the item’s [=preferred size|preferred=] [=main size=] is <a>definite</a>,
-			then the <a>specified size suggestion</a> is that size
-			(clamped by its [=maximum size|maximum=] [=main size=] if it's <a>definite</a>).
+			then the <a>specified size suggestion</a> is that size.
 			It is otherwise undefined.
 
 		<dt><dfn>transferred size suggestion</dfn>
@@ -998,16 +998,14 @@ Automatic Minimum Size of Flex Items</h3>
 			and its [=preferred size|preferred=] [=cross size=] is <a>definite</a>,
 			then the <a>transferred size suggestion</a> is that size
 			(clamped by its [=minimum size|minimum=] and [=maximum size|maximum=] [=cross sizes=] if they are <a>definite</a>),
-			converted through the aspect ratio,
-			and finally clamped by the same-axis [=maximum size=] if that is [=definite=].
+			converted through the aspect ratio.
 			It is otherwise undefined.
 
 		<dt><dfn>content size suggestion</dfn>
 		<dd>
 			The <a>content size suggestion</a> is the <a>min-content size</a> in the <a>main axis</a>,
 			clamped, if it has a [=preferred aspect ratio=],
-			by any <a>definite</a> [=minimum size|minimum=] and [=maximum size|maximum=] [=cross sizes=] converted through the aspect ratio,
-			and finally clamped by the [=maximum size|maximum=] [=main size=] if that is <a>definite</a>.
+			by any <a>definite</a> [=minimum size|minimum=] and [=maximum size|maximum=] [=cross sizes=] converted through the aspect ratio.
 	</dl>
 
 	For the purpose of calculating an intrinsic size of the box

css-grid-1/Overview.bs

@@ -1321,6 +1321,10 @@ Automatic Minimum Size of Grid Items</h3>
 	as represented by the sum of those <a>grid tracks</a>’ <a>max track sizing functions</a>
 	plus any intervening <a lt="fixed sizing function">fixed</a> <a>gutters</a>.
 
+	In all cases, the size suggestion is additionally clamped by the [=maximum size=],
+	if it's definite,
+	in the given axis.
+
 	Note: The argument to ''fit-content()'' does <em>not</em> clamp
 	the [=content-based minimum size=] in the same way as a
 	<a lt="fixed sizing function">fixed</a> <a>max track sizing function</a>.
@@ -1334,8 +1338,7 @@ Automatic Minimum Size of Grid Items</h3>
 		<dt><dfn>specified size suggestion</dfn>
 		<dd>
 			If the item’s [=preferred size=] in the relevant axis is <a>definite</a>,
-			then the <a>specified size suggestion</a> is that size
-			(clamped by the relevant [=maximum size=] if it's <a>definite</a>).
+			then the <a>specified size suggestion</a> is that size.
 			It is otherwise undefined.
 
 		<dt><dfn>transferred size suggestion</dfn>
@@ -1344,8 +1347,7 @@ Automatic Minimum Size of Grid Items</h3>
 			and its [=preferred size=] in the opposite axis is <a>definite</a>,
 			then the <a>transferred size suggestion</a> is that size
 			(clamped by the opposite-axis [=minimum size|minimum=] and [=maximum sizes=] if they are <a>definite</a>),
-			converted through the aspect ratio,
-			and finally clamped by the same-axis [=maximum size=] if that is [=definite=].
+			converted through the aspect ratio.
 			It is otherwise undefined.
 
 		<dt><dfn>content size suggestion</dfn>
@@ -1354,8 +1356,7 @@ Automatic Minimum Size of Grid Items</h3>
 			the <a>min-content size</a> in the relevant axis,
 			clamped, if it has a [=preferred aspect ratio=],
 			by any <a>definite</a> opposite-axis [=minimum size|minimum=] and [=maximum sizes=]
-			converted through the aspect ratio,
-			and finally clamped by the same-axis [=maximum size=] if that is <a>definite</a>.
+			converted through the aspect ratio.
 	</dl>
 
 	For the purpose of calculating an intrinsic size of the box

css-grid-2/Overview.bs

@@ -1368,6 +1368,10 @@ Automatic Minimum Size of Grid Items</h3>
 	as represented by the sum of those <a>grid tracks</a>’ <a>max track sizing functions</a>
 	plus any intervening <a lt="fixed sizing function">fixed</a> <a>gutters</a>.
 
+	In all cases, the size suggestion is additionally clamped by the [=maximum size=],
+	if it's definite,
+	in the given axis.
+
 	Note: The argument to ''fit-content()'' does <em>not</em> clamp
 	the [=content-based minimum size=] in the same way as a
 	<a lt="fixed sizing function">fixed</a> <a>max track sizing function</a>.
@@ -1381,8 +1385,7 @@ Automatic Minimum Size of Grid Items</h3>
 		<dt><dfn>specified size suggestion</dfn>
 		<dd>
 			If the item’s [=preferred size=] in the relevant axis is <a>definite</a>,
-			then the <a>specified size suggestion</a> is that size
-			(clamped by the relevant [=maximum size=] if it's <a>definite</a>).
+			then the <a>specified size suggestion</a> is that size.
 			It is otherwise undefined.
 
 		<dt><dfn>transferred size suggestion</dfn>
@@ -1391,8 +1394,7 @@ Automatic Minimum Size of Grid Items</h3>
 			and its [=preferred size=] in the opposite axis is <a>definite</a>,
 			then the <a>transferred size suggestion</a> is that size
 			(clamped by the opposite-axis [=minimum size|minimum=] and [=maximum sizes=] if they are <a>definite</a>),
-			converted through the aspect ratio,
-			and finally clamped by the same-axis [=maximum size=] if that is [=definite=].
+			converted through the aspect ratio.
 			It is otherwise undefined.
 
 		<dt><dfn>content size suggestion</dfn>
@@ -1401,8 +1403,7 @@ Automatic Minimum Size of Grid Items</h3>
 			the <a>min-content size</a> in the relevant axis,
 			clamped, if it has a [=preferred aspect ratio=],
 			by any <a>definite</a> opposite-axis [=minimum size|minimum=] and [=maximum sizes=]
-			converted through the aspect ratio,
-			and finally clamped by the same-axis [=maximum size=] if that is <a>definite</a>.
+			converted through the aspect ratio.
 	</dl>
 
 	For the purpose of calculating an intrinsic size of the box