[css-grid-1] Handle flexible tracks with fixed minimums similar to fixed tracks, to make sure spanning items get accommodated by the intrinsic tracks they cross. #3705

Author: fantasai

css-grid-1/Overview.bs

@@ -4041,7 +4041,9 @@ Resolve Intrinsic Track Sizes</h3>
 		<li id="algo-spanning-items">
 			<strong>Increase sizes to accommodate spanning items crossing content-sized tracks:</strong>
 			Next, consider the items with a span of 2
-			that do not span a track with a <a>flexible sizing function</a>.
+			that do not span a track with both
+			a <a>flexible sizing function</a> and
+			an <a lt="intrinsic sizing function">intrinsic</a> <a>min track sizing function</a>.
 			<!-- auto-min contribution <= min-content contribution <= max-content contribution -->
 
 			<ol>
@@ -4157,7 +4159,9 @@ Resolve Intrinsic Track Sizes</h3>
 			Next, repeat the previous step
 			instead considering (together, rather than grouped by span size)
 			all items
-			that <em>do</em> span a track with a <a>flexible sizing function</a>
+			that <em>do</em> span a track with both
+			a <a>flexible sizing function</a> and
+			an <a lt="intrinsic sizing function">intrinsic</a> <a>min track sizing function</a>
 			while
 			<ul>
 				<li>
@@ -4560,22 +4564,29 @@ Major Changes</h4>
 			to intrinsic track sizes so that
 			they contribute to the size of flexible tracks that have an intrinsic min
 			rather than being ignored.
-			(<a href="https://github.com/w3c/csswg-drafts/issues/2177">Issue 2177</a>)
+			(<a href="https://github.com/w3c/csswg-drafts/issues/2177">Issue 2177</a>,
+			 <a href="https://github.com/w3c/csswg-drafts/issues/3705">3705</a>)
 			<blockquote>
 				<ul>
 					<li>
 						<strong>Size tracks to fit non-spanning items:</strong>
 						For each track with an intrinsic <a>track sizing function</a>
 						<ins>and not a <a>flexible sizing function</a></ins>,
-						consider the items in it with a span of 1:
+						consider the items in it with a span of 1: &hellip;
 					<li>
-						&hellip;
+						<strong>Increase sizes to accommodate spanning items crossing content-sized tracks:</strong>
+						Next, consider the items with a span of 2
+						that do not span a track with <ins>both</ins>
+						a <a>flexible sizing function</a> <ins>and
+						an <a lt="intrinsic sizing function">intrinsic</a> <a>min track sizing function</a></ins>.
 					<li>
 						<ins><strong>Increase sizes to accommodate spanning items crossing flexible tracks:</strong>
 						Next, repeat the previous step
 						instead considering (together, rather than grouped by span size)
 						all items
-						that <em>do</em> span a track with a <a>flexible sizing function</a>
+						that <em>do</em> span a track with both
+						a flexible sizing function and
+						an intrinsic min track sizing function
 						while
 						<ul>
 							<li>