[css-grid] Tweak baseline cyclic case wording, update changes list.

Author: fantasai

css-grid-1/Overview.bs

@@ -3315,8 +3315,9 @@ Row-axis Alignment: the 'justify-self' and 'justify-items' properties</h3>
 	</div>
 
 	If <a>baseline alignment</a> is specified on a <a>grid item</a>
-	whose size depends on the size of an intrinsically-sized track
-	(whose size is therefore dependent on the item's size, creating a cyclic dependency),
+	whose size in that axis depends on the size of an intrinsically-sized track
+	(whose size is therefore dependent on both the item's size and baseline alignment,
+	creating a cyclic dependency),
 	that item does not participate in baseline alignment,
 	and instead uses its <a>fallback alignment</a>.
 
@@ -3330,8 +3331,9 @@ Column-axis Alignment: the 'align-self' and 'align-items' properties</h3>
 	as defined in [[!CSS-ALIGN-3]].
 
 	If <a>baseline alignment</a> is specified on a <a>grid item</a>
-	whose size depends on the size of an intrinsically-sized track
-	(whose size is therefore dependent on the item's size, creating a cyclic dependency),
+	whose size in that axis depends on the size of an intrinsically-sized track
+	(whose size is therefore dependent on both the item's size and baseline alignment,
+	creating a cyclic dependency),
 	that item does not participate in baseline alignment,
 	and instead uses its <a>fallback alignment</a>.
 
@@ -4240,10 +4242,6 @@ Changes since the <a href="https://www.w3.org/TR/2016/CR-css-grid-1-20160929/">2
 
 	A <a href="https://drafts.csswg.org/css-grid-1/issues-cr-2016">Disposition of Comments</a> is also available.
 
-	There remains an open issue on
-	<a href="https://drafts.csswg.org/css-grid-1/issues-cr-2016#issue-15">percentages inside shrink-wrapped grid containers</a>
-	at the time of publication.
-
 <h4 id="major-2016">
 Major Changes</h4>
 
@@ -4366,6 +4364,52 @@ Significant Adjustments and Fixes</h4>
 			</ins>
 			</blockquote>
 
+		<li id="change-2016-baseline-algo">
+			Better integrated <a>baseline alignment</a> of grid items
+			into the track sizing algorithm;
+			excluded cyclic cases from participating.
+			(<a href="https://github.com/w3c/csswg-drafts/issues/1039">Issue 1039</a>,
+			<a href="https://github.com/w3c/csswg-drafts/issues/1365">Issue 1365</a>,)
+			<blockquote>
+				<ins>
+					<p>If <a>baseline alignment</a> is specified on a <a>grid item</a>
+					whose size in that axis depends on the size of an intrinsically-sized track
+					(whose size is therefore dependent on both the item's size and baseline alignment,
+					creating a cyclic dependency),
+					that item does not participate in baseline alignment,
+					and instead uses its <a>fallback alignment</a>.</p>
+				</ins>
+			</blockquote>
+			<blockquote>
+				<ins>
+					<p><strong>Shim baseline-aligned items
+					so their intrinsic size contributions reflect their baseline alignment.</strong>
+					For the items in each <a>baseline-sharing group</a>,
+					add a “shim” (effectively, additional margin)
+					on the start/end side (for first/last-baseline alignment)
+					of each item
+					so that,
+					when start/end-aligned together
+					their [[css-align-3#baseline-values|baselines align as specified]].
+
+					Consider these “shims” as part of the items’ intrinsic size contribution
+					for the purpose of track sizing, below.
+					If an item uses multiple intrinsic size contributions,
+					it can have different shims for each one.
+
+					Note: Note that both [[css-align-3#baseline-align-self|baseline self-aligned]]
+					and [[css-align-3#baseline-align-content|baseline content-aligned]] items
+					are considered in this step,
+					but they live in separate <a>baseline-sharing groups</a>.
+					[[CSS-ALIGN-3]]
+
+					Note: Since <a>grid items</a> whose own size
+					depends on the size of an intrinsically-sized track
+					<a href="#row-align">do not participate in baseline alignment</a>,
+					they are not shimmed.
+				</ins>
+			</blockquote>
+
 		<li id="change-2016-auto-min-fixed-tracks">
 			Adjusted <a href="#min-size-auto">automatic minimum size</a> of grid items
 			to only trigger when spanning ''grid-template-columns/auto'' tracks