[css-grid-1][css-grid-2] Sync across levels.

Author: fantasai

css-grid-1/Overview.bs

@@ -1,31 +1,33 @@
 <pre class='metadata'>
 Title: CSS Grid Layout Module Level 1
-Status: ED
-Work Status: Testing
 Shortname: css-grid
 Level: 1
+Status: ED
+Work Status: Testing
 Group: csswg
-ED: https://drafts.csswg.org/css-grid/
 TR: https://www.w3.org/TR/css-grid-1/
+ED: https://drafts.csswg.org/css-grid-1/
+Issue Tracking: Disposition of Comments https://drafts.csswg.org/css-grid-1/issues
+Issue Tracking: CSSWG GitHub https://github.com/w3c/csswg-drafts/issues?q=is%3Aopen+is%3Aissue+label%3Acss-grid-1
 Implementation Report: https://wpt.fyi/results/css/css-grid
+WPT Path Prefix: css/css-grid/
 Editor: Tab Atkins Jr., Google, http://www.xanthir.com/contact/, w3cid 42199
 Editor: Elika J. Etemad / fantasai, Apple, http://fantasai.inkedblade.net/contact, w3cid 35400
 Editor: Rossen Atanassov, Microsoft, ratan@microsoft.com, w3cid 49885
 Editor: Oriol Brufau, Igalia, obrufau@igalia.com, w3cid 108473
 Former editor: Alex Mogilevsky, Microsoft Corporation, alexmog@microsoft.com
 Former editor: Phil Cupp, Microsoft Corporation, pcupp@microsoft.com
-Issue Tracking: Disposition of Comments https://drafts.csswg.org/css-grid-1/issues
+
 Abstract: This CSS module defines a two-dimensional grid-based layout system, optimized for user interface design. In the grid layout model, the children of a grid container can be positioned into arbitrary slots in a predefined flexible or fixed-size layout grid.
 Ignored Terms: auto, grid-*-start, grid-*-end, flex factor, flex factors, grid-auto-position
 Ignored Vars: A, B, C, size-contribution, track-sizes, extra-space
 Link Defaults: css2 (property) margin/min-height/max-height/min-width/max-width, css-align-3 (value) stretch/baseline, css-position-3 (property) left, css-position-3 (property) position, css-writing-modes-3 (dfn) start/end
 At Risk: application of grid placement to absolutely-positioned boxes
-WPT Path Prefix: css/css-grid/
 Ignore MDN Failure: valdef-grid-template-columns-minmax
 Ignore MDN Failure: subgrids
 </pre>
 
-<pre class="link-defaults">
+<pre class=link-defaults>
 spec:css-align-3;
 	type:value;
 		text:center; for:align-self;
@@ -34,6 +36,7 @@ spec:css-align-3;
 		text:space-between; for:justify-content
 		text:space-around; for:justify-content
 	type:property; text:column-gap
+	type: value; for:column-gap; text:normal
 	type:dfn; text:alignment baseline
 spec:css-break-3; type:dfn; text:fragment
 spec:css-flexbox-1;
@@ -851,7 +854,7 @@ Establishing Grid Containers: the ''display/grid'' and ''inline-grid'' 'display'
 
 		<dt><dfn>inline-grid</dfn>
 		<dd>
-			This value causes an element to generate an <a>grid container</a> box
+			This value causes an element to generate a <a>grid container</a> box
 			that is <a>inline-level</a> when placed in <a>flow layout</a>.
 	</dl>
 
@@ -1112,7 +1115,6 @@ Grid Items</h2>
 		for the corresponding axis.
 		(See [[CSS2#q10.0]].)
 
-
 	: ''align-self/stretch''
 	::
 		Use the [=inline size=] calculation rules for non-replaced boxes
@@ -1457,7 +1459,7 @@ Explicit Track Sizing: the 'grid-template-rows' and 'grid-template-columns' prop
 
 	These properties specify,
 	as a space-separated <dfn export>track list</dfn>,
-	the line names and <a>track sizing functions</a> of the <a>grid</a>.
+	the [=line names=] and <a>track sizing functions</a> of the <a>grid</a>.
 	The 'grid-template-columns' property specifies the <a>track list</a> for the grid's columns,
 	while 'grid-template-rows' specifies the <a>track list</a> for the grid's rows.
 
@@ -1475,7 +1477,7 @@ Explicit Track Sizing: the 'grid-template-rows' and 'grid-template-columns' prop
 		<dt><dfn id="track-listing"><<track-list>> | <<auto-track-list>></dfn>
 		<dd>
 			Specifies the <a>track list</a> as a series of <a>track sizing functions</a>
-			and line names.
+			and [=line names=].
 			Each <dfn dfn lt="track sizing function|sizing function">track sizing function</dfn> can be specified as a length,
 			a percentage of the <a>grid container</a>’s size,
 			a measurement of the contents occupying the column or row,
@@ -1706,7 +1708,8 @@ Naming Grid Lines: the <css>[<<custom-ident>>*]</css> syntax</h4>
 <h4 id='repeat-notation'>
 Repeating Rows and Columns: the ''repeat()'' notation</h4>
 
-	The <dfn>repeat()</dfn> notation represents a repeated fragment of the <a>track list</a>,
+	The <dfn for="<track-repeat>,<auto-repeat>,<fixed-repeat>">repeat()</dfn> notation
+	represents a repeated fragment of the <a>track list</a>,
 	allowing a large number of columns or rows that exhibit a recurring pattern
 	to be written in a more compact form.
 
@@ -1939,9 +1942,11 @@ Computed Value of a Track Listing</h4>
 
 	* a ''minmax()'' functional notation representing a single track's size,
 		with each <<length-percentage>> computed
+		(a <dfn noexport>computed track size</dfn>)
 	* a ''repeat()'' functional notation representing a repeated track list section,
 		with its <<integer>> computed
 		and its <<track-list>> represented as a [=computed track list=]
+		(a <dfn>computed repeat notation</dfn>)
 
 <!--
 ████████  ████████  ██████   ███████  ██       ██     ██ ████████ ████████
@@ -2241,7 +2246,7 @@ Explicit Grid Shorthand: the 'grid-template' property</h3>
 			<div class='example'>
 				<pre>grid-template: auto 1fr / auto 1fr auto;</pre>
 
-					is equivalent to
+				is equivalent to
 
 				<pre>
 					grid-template-rows: auto 1fr;
@@ -2411,11 +2416,14 @@ Implicit Track Sizing: the 'grid-auto-rows' and 'grid-auto-columns' properties</
 		</pre>
 
 		<figure>
-		<img src="images/auto-flow.svg" alt="" width=530 height=530>
-			<figcaption>A 2&times;2 grid with one explicit 20px&times;20px grid cell
-			in the first row+column
-			and three additional cells resulting from the implicit 40px column and row
-			generated to hold the additional grid items.
+			<img src="images/auto-flow.svg" alt="" width=530 height=530>
+			<figcaption>
+				A 2&times;2 grid with
+				one explicit 20px&times;20px grid cell in the first row+column
+				and three additional cells resulting from
+				the implicit 40px column and row generated
+				to hold the additional grid items.
+			</figcaption>
 		</figure>
 	</div>
 
@@ -3043,7 +3051,7 @@ Line-based Placement: the 'grid-row-start', 'grid-column-start', 'grid-row-end',
 
 				<figure>
 					<img src="images/implicit-lines-search.svg" width=600>
-					<figcaption>An illustration of the result.
+					<figcaption>An illustration of the result.</figcaption>
 				</figure>
 			</div>
 
@@ -3582,7 +3590,7 @@ Aligning with <a value for="margin">auto</a> margins</h3>
 
 		<li>
 			Overflowing [=grid items=] resolve their ''margin/auto'' margins to zero
-			and ''justify-self/start''-align within their [=containing block=].
+			and overflow as specified by their <a>box alignment properties</a>.
 	</ul>
 
 <h3 id='row-align'>
@@ -3666,7 +3674,7 @@ Aligning the Grid: the 'justify-content' and 'align-content' properties</h3>
 	Note that certain values of 'justify-content' and 'align-content'
 	can cause the tracks to be spaced apart
 	(''justify-content/space-around'', ''justify-content/space-between'', ''justify-content/space-evenly'')
-	or to be resized (''&lt;content-distribution>/stretch'').
+	or to be resized (''<content-distribution>/stretch'').
 	If the <a>grid</a> is <a>fragmented</a> between tracks,
 	any such additional spacing between those tracks must be suppressed.
 
@@ -3695,13 +3703,13 @@ Aligning the Grid: the 'justify-content' and 'align-content' properties</h3>
 			<img src="images/spanned-gap.svg"
 			     alt="Grid with 10px gap and an element spanning all columns.
 			          The sum of the columns is less than the width of the grid container." height="426" width="500">
-			<figcaption>Grid before alignment</figure>
+			<figcaption>Grid before alignment</figcaption>
 		</figure>
 		<figure>
 			<img src="images/spanned-gap-align.svg"
 			     alt="Same grid with increased gaps absorbing the excess grid container width.
 			          The spanning element has grown to accommodate the extra space assigned to the gap it crosses." height="426" width="500">
-			<figcaption>Grid after alignment</figure>
+			<figcaption>Grid after alignment</figcaption>
 		</figure>
 
 		Note that alignment (unlike 'gap' spacing)
@@ -4340,7 +4348,7 @@ Resolve Intrinsic Track Sizes</h3>
 	when items span across multiple tracks.
 	This algorithm embodies a number of heuristics
 	which have been seen to deliver good results on real-world use-cases,
-	such as the “game”̣ examples earlier in this specification.
+	such as the “game” examples earlier in this specification.
 	This algorithm may be updated in the future
 	to take into account more advanced heuristics as they are identified.
 
@@ -4713,6 +4721,16 @@ Sample Fragmentation Algorithm</h3>
 		overflow the grid.
 	</p>
 
+Privacy Considerations {#privacy}
+===============================================
+
+	Grid Layout introduces no new privacy leaks.
+
+Security Considerations {#security}
+=================================
+
+	Grid Layout introduces no new security considerations.
+
 <h2 class="no-num" id="acks">
 Acknowledgements</h2>
 
@@ -5197,7 +5215,7 @@ Major Changes</h4>
 					</ul>
 				</ins>
 
-				<p><ins>Otherwise, the used <a>automatic minimum size</a> is <del>otherwise</del> zero, as usual.</p>
+				<p><ins>Otherwise,</ins> the used <a>automatic minimum size</a> is <del>otherwise</del> zero, as usual.</p>
 			</blockquote>
 
 			<wpt>
@@ -5265,12 +5283,14 @@ Minor Changes</h4>
 					<dt><del>A <a>flexible sizing function</a></del>
 					<dd>
 						<del>Use the track’s initial <a>base size</a> as its initial <a>growth limit</a>.</del>
+				</dl>
 			</blockquote>
 			<blockquote>
 				<ul>
 					<li>
 						<del>treating <a>flexible tracks</a> as having
-						an infinite <a>growth limit</a>
+						an infinite <a>growth limit</a></del>
+				</ul>
 			</blockquote>
 			This change is purely editorial; it should have no effect on implementations.
 
@@ -5297,7 +5317,7 @@ Minor Changes</h4>
 				<ol>
 					<li>
 						<p><ins>Find the first (last) row of the [=grid container=]
-						containing at least one [=grid item=].
+						containing at least one [=grid item=].</ins>
 
 						<p><del>If any of the <a>grid items</a> whose areas intersect the <a>grid container</a>’s first (last) row
 						participate in <a>baseline alignment</a>,</del>
@@ -5563,7 +5583,8 @@ Clarifications</h4>
 
 				<p class=note>Note: If the affected size was a <a>growth limit</a>
 				<ins>and the track is not marked [=infinitely growable=],
-				then each |item-incurred increase| will be zero.
+				then each |item-incurred increase| will be zero</ins>
+				<del>this step has no effect</del>.
 			</blockquote>
 	</ul>
 
@@ -5738,7 +5759,7 @@ Significant Adjustments and Fixes</h4>
 					Note: Since <a>grid items</a> whose own size
 					depends on the size of an intrinsically-sized track
 					[[#row-align|do not participate in baseline alignment]],
-					they are not shimmed.
+					they are not shimmed.</p>
 				</ins>
 			</blockquote>
 
@@ -5887,7 +5908,7 @@ Significant Adjustments and Fixes</h4>
 			<blockquote>
 				As a <a>block-level</a> box in a <a>block formatting context</a>,
 				it is sized like a <a>block box</a> that establishes a formatting context,
-				with an ''auto'' <a>inline size</a> calculated as for <del>in-flow</del><ins>non-replaced</a> block boxes.
+				with an ''auto'' <a>inline size</a> calculated as for <del>in-flow</del><ins>non-replaced</ins> block boxes.
 			</blockquote>
 		<li id="change-2016-tracks-before">
 			Fixed error in pattern repetition for finding <a>implicit grid track</a> sizes.
@@ -5973,17 +5994,6 @@ Clarifications</h4>
 		<li>Miscellaneous trivial fixes and minor editorial improvements.
 	</ul>
 
-
-Privacy Considerations {#privacy}
-===============================================
-
-	Grid Layout introduces no new privacy leaks.
-
-Security Considerations {#security}
-=================================
-
-	Grid Layout introduces no new security considerations.
-
 <wpt ignore>
 	abspos/absolute-positioning-changing-containing-block-001.html
 	abspos/absolute-positioning-definite-sizes-001.html