[css-flexbox] Fix special cases of multi-line flex containers iwht a single line to fall under the multi-line behavior, not the single-line flex container behavior.

Author: fantasai

css-flexbox/Overview.bs

@@ -1409,11 +1409,12 @@ Flex Lines</h2>
 		flexible lengths and the 'justify-content' and 'align-self' properties only consider the items on a single line at a time.
 
 	<p>
-		When a flex container has multiple lines, the <i>cross size</i> of each line
+		In a <i>multi-line</i> <i>flex container</i> (even one with only a single line),
+		the <i>cross size</i> of each line
 		is the minimum size necessary to contain the <i>flex items</i> on the line
 		(after aligment due to 'align-self'),
 		and the lines are aligned within the flex container with the 'align-content' property.
-		When a flex container (even a <i>multi-line</i> one) has only one line,
+		In a <i>single-line</i> <i>flex container</i>,
 		the <i>cross size</i> of the line is the <i>cross size</i> of the flex container,
 		and 'align-content' has no effect.
 		The <i>main size</i> of a line is always the same as the <i>main size</i> of the flex container's content box.
@@ -2068,7 +2069,7 @@ Packing Flex Lines: the 'align-content' property</h3>
 		The 'align-content' property aligns a flex container's lines within the flex container
 		when there is extra space in the <i>cross-axis</i>,
 		similar to how 'justify-content' aligns individual items within the <i>main-axis</i>.
-		Note, this property has no effect when the flex container has only a single line.
+		Note, this property has no effect on a <i>single-line</i> <i>flex container</i>.
 		Values have the following meanings:
 
 	<dl dfn-type=value dfn-for=align-content>
@@ -2134,9 +2135,9 @@ Packing Flex Lines: the 'align-content' property</h3>
 	</dl>
 
 	<p class='note'>
-		Note: Only flex containers with multiple lines
+		Note: Only <i>multi-line</i> <i>flex containers</i>
 		ever have free space in the <i>cross-axis</i> for lines to be aligned in,
-		because in a flex container with a single line
+		because in a <i>single-line</i> flex container
 		the sole line automatically stretches to fill the space.
 
 	<div class="figure">
@@ -2406,8 +2407,7 @@ Cross Size Determination</h3>
 			<strong>Calculate the cross size of each flex line.</strong>
 
 			<p>
-				If the flex container has only one <i>flex line</i>
-				(even if it's a <i>multi-line</i> <i>flex container</i>)
+				If the flex container is <i>single-line</i>
 				and has a <i>definite</i> <i>cross size</i>,
 				the <i>cross size</i> of the <i>flex line</i>
 				is the <i>flex container</i>'s inner <i>cross size</i>.
@@ -2432,8 +2432,7 @@ Cross Size Determination</h3>
 				<li>
 					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 has only one flex line
-					(even if it's a multi-line flex container),
+					If the flex container is <i>single-line</i>,
 					then clamp the line's cross-size to be within the container's computed min and max cross-size properties.
 					<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>

css-flexbox/Overview.html

@@ -1422,11 +1422,12 @@ <h2 class="heading settled" data-level=6 id=flex-lines><span class=secno>6. </sp
 		flexible lengths and the <a class=property data-link-type=propdesc href=#propdef-justify-content title=justify-content>justify-content</a> and <a class=property data-link-type=propdesc href=#propdef-align-self title=align-self>align-self</a> properties only consider the items on a single line at a time.
 
 	<p>
-		When a flex container has multiple lines, the <a data-link-type=dfn href=#cross-size title="cross size">cross size</a> of each line
+		In a <a data-link-type=dfn href=#multi-line title=multi-line>multi-line</a> <a data-link-type=dfn href=#flex-container title="flex container">flex container</a> (even one with only a single line),
+		the <a data-link-type=dfn href=#cross-size title="cross size">cross size</a> of each line
 		is the minimum size necessary to contain the <a data-link-type=dfn href=#flex-item title="flex items">flex items</a> on the line
 		(after aligment due to <a class=property data-link-type=propdesc href=#propdef-align-self title=align-self>align-self</a>),
 		and the lines are aligned within the flex container with the <a class=property data-link-type=propdesc href=#propdef-align-content title=align-content>align-content</a> property.
-		When a flex container (even a <a data-link-type=dfn href=#multi-line title=multi-line>multi-line</a> one) has only one line,
+		In a <a data-link-type=dfn href=#single-line title=single-line>single-line</a> <a data-link-type=dfn href=#flex-container title="flex container">flex container</a>,
 		the <a data-link-type=dfn href=#cross-size title="cross size">cross size</a> of the line is the <a data-link-type=dfn href=#cross-size title="cross size">cross size</a> of the flex container,
 		and <a class=property data-link-type=propdesc href=#propdef-align-content title=align-content>align-content</a> has no effect.
 		The <a data-link-type=dfn href=#main-size title="main size">main size</a> of a line is always the same as the <a data-link-type=dfn href=#main-size title="main size">main size</a> of the flex container’s content box.
@@ -1971,7 +1972,7 @@ <h3 class="heading settled" data-level=8.4 id=align-content-property><span class
 		The <a class=property data-link-type=propdesc href=#propdef-align-content title=align-content>align-content</a> property aligns a flex container’s lines within the flex container
 		when there is extra space in the <a data-link-type=dfn href=#cross-axis title=cross-axis>cross-axis</a>,
 		similar to how <a class=property data-link-type=propdesc href=#propdef-justify-content title=justify-content>justify-content</a> aligns individual items within the <a data-link-type=dfn href=#main-axis title=main-axis>main-axis</a>.
-		Note, this property has no effect when the flex container has only a single line.
+		Note, this property has no effect on a <a data-link-type=dfn href=#single-line title=single-line>single-line</a> <a data-link-type=dfn href=#flex-container title="flex container">flex container</a>.
 		Values have the following meanings:
 
 	<dl data-dfn-for=align-content data-dfn-type=value>
@@ -2037,9 +2038,9 @@ <h3 class="heading settled" data-level=8.4 id=align-content-property><span class
 	</dl>
 
 	<p class=note>
-		Note: Only flex containers with multiple lines
+		Note: Only <a data-link-type=dfn href=#multi-line title=multi-line>multi-line</a> <a data-link-type=dfn href=#flex-container title="flex containers">flex containers</a>
 		ever have free space in the <a data-link-type=dfn href=#cross-axis title=cross-axis>cross-axis</a> for lines to be aligned in,
-		because in a flex container with a single line
+		because in a <a data-link-type=dfn href=#single-line title=single-line>single-line</a> flex container
 		the sole line automatically stretches to fill the space.
 
 	<div class=figure>
@@ -2284,8 +2285,7 @@ <h3 class="heading settled" data-level=9.4 id=cross-sizing><span class=secno>9.4
 			<strong>Calculate the cross size of each flex line.</strong>
 
 			<p>
-				If the flex container has only one <a data-link-type=dfn href=#flex-line title="flex line">flex line</a>
-				(even if it’s a <a data-link-type=dfn href=#multi-line title=multi-line>multi-line</a> <a data-link-type=dfn href=#flex-container title="flex container">flex container</a>)
+				If the flex container is <a data-link-type=dfn href=#single-line title=single-line>single-line</a>
 				and has a <a data-link-type=dfn href=#definite title=definite>definite</a> <a data-link-type=dfn href=#cross-size title="cross size">cross size</a>,
 				the <a data-link-type=dfn href=#cross-size title="cross size">cross size</a> of the <a data-link-type=dfn href=#flex-line title="flex line">flex line</a>
 				is the <a data-link-type=dfn href=#flex-container title="flex container">flex container</a>’s inner <a data-link-type=dfn href=#cross-size title="cross size">cross size</a>.
@@ -2310,8 +2310,7 @@ <h3 class="heading settled" data-level=9.4 id=cross-sizing><span class=secno>9.4
 				<li>
 					The used cross-size of the <a data-link-type=dfn href=#flex-line title="flex line">flex line</a> is the largest of the numbers found in the previous two steps and zero.
 
-<p>If the flex container has only one flex line
-					(even if it’s a multi-line flex container),
+<p>If the flex container is <a data-link-type=dfn href=#single-line title=single-line>single-line</a>,
 					then clamp the line’s cross-size to be within the container’s computed min and max cross-size properties.
 					<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></p>