[css-flexbox-1] Clarify that min/max clamping uses used values. #2442

Author: fantasai

css-flexbox-1/Overview.bs

@@ -455,9 +455,14 @@ Flex Layout Box Model and Terminology</h2>
 			The width or height of a <a>flex container</a> or <a>flex item</a>,
 			whichever is in the <a>main dimension</a>,
 			is that box’s <dfn lt="main size|main-size">main size</dfn>.
-			Its <dfn lt="main size property|max main size property|min main size property">main size property</dfn> is
+			Its <dfn>main size property</dfn> is
 			thus either its 'width' or 'height' property,
 			whichever is in the <a>main dimension</a>.
+			Similarly, its <dfn lt="min main size property">min</dfn> and
+			<dfn lt="max main size property">max main size properties</dfn>
+			are its 'min-width'/'max-width' or 'min-height'/'max-height' properties,
+			whichever is in the <a>main dimension</a>,
+			and determine its <dfn lt="min main size">min</dfn>/<dfn>max main size</dfn>.
 	</dl>
 
 	<dl id="cross" export>
@@ -480,9 +485,14 @@ Flex Layout Box Model and Terminology</h2>
 			The width or height of a <a>flex container</a> or <a>flex item</a>,
 			whichever is in the <a>cross dimension</a>,
 			is that box’s <dfn lt="cross size | cross-size">cross size</dfn>.
-			Its <dfn lt="cross size property|max cross size property|min cross size property">cross size property</dfn> is
+			Its <dfn>cross size property</dfn> is
 			thus either its 'width' or 'height' property,
 			whichever is in the <a>cross dimension</a>.
+			Similarly, its <dfn lt="min cross size property">min</dfn> and
+			<dfn lt="max cross size property">max cross size properties</dfn>
+			are its 'min-width'/'max-width' or 'min-height'/'max-height' properties,
+			whichever is in the <a>cross dimension</a>,
+			and determine its <dfn lt="min cross size">min</dfn>/<dfn>max cross size</dfn>.
 	</dl>
 
 	Additional sizing terminology used in this specification
@@ -2408,7 +2418,7 @@ Line Length Determination</h3>
 			</ol>
 
 			When determining the <a>flex base size</a>,
-			the item’s min and max main size properties are ignored
+			the item’s min and max <a>main sizes</a> are ignored
 			(no clamping occurs).
 			Furthermore, the sizing calculations that floor the content box size at zero
 			when applying 'box-sizing' are also ignored.
@@ -2418,7 +2428,7 @@ Line Length Determination</h3>
 			and hence a negative inner <a>flex base size</a>.)
 
 			The <a>hypothetical main size</a> is the item's <a>flex base size</a>
-			clamped according to its min and max main size properties
+			clamped according to its <a lt="used value">used</a> min and max <a>main sizes</a>
 			(and flooring the content box size at zero).
 
 		<li id='algo-main-container'>
@@ -2507,7 +2517,8 @@ Cross Size Determination</h3>
 					The used cross-size of the <a>flex line</a> is the largest of the numbers found in the previous two steps and zero.
 
 					If the flex container is <a>single-line</a>,
-					then clamp the line's cross-size to be within the container's computed min and max cross-size properties.
+					then clamp the line's cross-size to be within
+					the container's computed min and max <a>cross sizes</a>.
 					<span class='note'>Note that if CSS 2.1's definition of min/max-width/height applied more generally,
 					this behavior would fall out automatically.</span>
 			</ol>
@@ -2549,7 +2560,7 @@ Cross Size Determination</h3>
 			its computed cross size property is <a value for=width>auto</a>,
 			and neither of its cross-axis margins are <a value for=margin>auto</a>,
 			the used outer cross size is the used cross size of its flex line,
-			clamped according to the item's min and max cross size properties.
+			clamped according to the item's used min and max <a>cross sizes</a>.
 			Otherwise,
 			the used cross size is the item's <a>hypothetical cross size</a>.
 
@@ -2618,12 +2629,14 @@ Cross-Axis Alignment</h3>
 				<li>
 					If the cross size property is a <a>definite</a> size,
 					use that,
-					clamped by the min and max cross size properties of the <a>flex container</a>.
+					clamped by the used min and max <a>cross sizes</a>
+					of the <a>flex container</a>.
 
 				<li>
 					Otherwise,
 					use the sum of the flex lines' cross sizes,
-					clamped by the min and max cross size properties of the <a>flex container</a>.
+					clamped by the used min and max <a>cross sizes</a>
+					of the <a>flex container</a>.
 			</ul>
 
 		<li id='algo-line-align'>
@@ -2721,7 +2734,8 @@ Resolving Flexible Lengths</h3>
 
 				<li>
 					<strong>Fix min/max violations.</strong>
-					Clamp each non-frozen item's <a>target main size</a> by its min and max main size properties
+					Clamp each non-frozen item's <a>target main size</a> by
+					its <a lt="used value">used</a> min and max <a>main sizes</a>
 					and floor its content-box size at zero.
 					If the item's <a>target main size</a> was made smaller by this,
 					it's a max violation.
@@ -2847,8 +2861,8 @@ Flex Container Intrinsic Main Sizes</h4>
 			to the product of its <a>flex grow factor</a>
 			(or <a>scaled flex shrink factor</a>, if the chosen <var>max-content flex fraction</var> was negative)
 			and the chosen <var>max-content flex fraction</var>,
-			then clamp that result by the <a>max main size property</a>
-			floored by the <a>min main size property</a>.
+			then clamp that result by the <a>max main size</a>
+			floored by the <a>min main size</a>.
 
 		<li>
 			The <a>flex container</a>’s <a>max-content size</a> is the
@@ -2932,14 +2946,14 @@ Flex Item Intrinsic Size Contributions</h4>
 	if that is not ''width/auto'',
 	clamped by its <a>flex base size</a> as a maximum (if it is not growable)
 	and/or as a minimum (if it is not shrinkable),
-	and then further clamped by its <a lt="min main size property">min</a>/<a>max main size properties</a>.
+	and then further clamped by its <a lt="min main size">min</a>/<a>max main size</a>.
 
 	The <strong>main-size <a>max-content contribution</a> of a <a>flex item</a></strong>
 	is the larger of its <em>outer</em> <a>max-content size</a>
 	and outer <a>preferred size</a> (its 'width'/'height' as appropriate)
 	clamped by its <a>flex base size</a> as a maximum (if it is not growable)
 	and/or as a minimum (if it is not shrinkable),
-	and then further clamped by its <a lt="min main size property">min</a>/<a>max main size properties</a>.
+	and then further clamped by its <a lt="min main size">min</a>/<a>max main size</a>.
 
 <!--
 ████████ ████████     ███     ██████   ██     ██ ████████ ██    ██ ████████ ████ ██    ██  ██████
@@ -3561,6 +3575,13 @@ Changes since the 16 October 2017 CR</h3>
 			(<a href="https://github.com/w3c/csswg-drafts/issues/2230">Issue 2230</a>,
 			<a href="https://github.com/w3c/csswg-drafts/issues/2248">Issue 2248</a>)
 
+		<li id="change-2017-used-min-sizes">
+			Clarified that min/max clamping is according to the <a>used value</a>
+			of the min/max size properties--
+			which in the case of tables with ''table-layout/auto'' layout,
+			is floored by the table’s <a>min-content size</a>.
+			(<a href="https://github.com/w3c/csswg-drafts/issues/2442">Issue 2442</a>)
+
 		<li>
 			Some minor editorial fixes and clarifications.
 	</ul>
@@ -3599,7 +3620,6 @@ Substantive Changes and Bugfixes</h4>
 				</p>
 				<p>
 					The <a>hypothetical main size</a> is the item's <a>flex base size</a>
-					clamped according to its min and max main size properties.
 					clamped according to its min and max main size properties
 					<ins>(and flooring the content box size at zero)</ins>.
 				</p>