merge

Author: Peter Linss

css-grid-2/Overview.bs

@@ -7,7 +7,7 @@ Group: csswg
 Work Status: exploring
 TR: https://www.w3.org/TR/css-grid-2/
 ED: https://drafts.csswg.org/css-grid-2/
-Previous version: https://www.w3.org/TR/2018/WD-css-grid-2-20180206/
+Previous version: https://www.w3.org/TR/2018/WD-css-grid-2-20180427/
 Editor: Tab Atkins Jr., Google, http://www.xanthir.com/contact/, w3cid 42199
 Editor: Elika J. Etemad / fantasai, Invited Expert, http://fantasai.inkedblade.net/contact, w3cid 35400
 Editor: Rossen Atanassov, Microsoft, ratan@microsoft.com, w3cid 49885
@@ -104,7 +104,10 @@ Establishing a Subgrid</h3>
 			indicates that the grid will adopt the spanned portion of its parent grid in that axis.
 			Rather than being specified explicitly,
 			the sizes of the grid rows/columns
-			will be taken from the parent grid's definition.
+			will be taken from the parent grid's definition,
+			and the <a>subgrid</a>’s items will participate
+			in the <a href="https://www.w3.org/TR/css-grid-1/#algo-content">intrinsic size calculations</a> ([[css-grid-1#algo-content]])
+			of any tracks shared with the parent grid.
 
 			The <<line-name-list>> argument allows local naming of the grid lines propagated from the parent grid:
 			if a <<line-name-list>> is given,
@@ -117,6 +120,10 @@ Establishing a Subgrid</h3>
 			the initial value, ''grid-template-rows/none''.
 	</dl>
 
+	Unlike those of a regular nested grid,
+	a subgrid’s contents participate in its parent <a>grid formatting contex</a>;
+	thus a subgrid does not establish an <a>independent formatting context</a>.
+
 	The syntax of <<line-name-list>> is defined as follows:
 
 	<pre class="prod">

css-images-3/Overview.bs

@@ -1422,12 +1422,12 @@ Image Processing {#image-processing}
 
 	<pre class='propdef'>
 	Name: image-orientation
-	Value: from-image | <<angle>> | [ <<angle>>? flip ]
-	Initial: 0deg
+	Value: none | from-image | <<angle>> | [ <<angle>>? flip ]
+	Initial: none
 	Applies to: all elements
 	Inherited: yes
 	Media: visual
-	Computed value: an <<angle>>, rounded and normalized (see text), plus optionally a ''flip'' keyword
+	Computed value: the specified keyword, or an <<angle>>, rounded and normalized (see text), plus optionally a ''flip'' keyword
 	Animatable: no
 	</pre>
 
@@ -1443,9 +1443,16 @@ Image Processing {#image-processing}
 	* The height (width) property applies to the vertical (horizontal) dimension of the image,
 		<em>after</em> rotation.
 
+	Values other than ''image-orientation/none'' and ''from-image'' are
+	<em>optional</em> to implement and <em>deprecated</em> in CSS.
 	Values have the following meanings:
 
 	<dl dfn-type=value dfn-for=image-orientation>
+		<dt><dfn>none</dfn>
+		<dd>
+			No additional rotation is applied:
+			the image is oriented as encoded.
+
 		<dt><dfn>from-image</dfn>
 		<dd>
 			If the image has an orientation specified in its metadata,
@@ -1818,7 +1825,9 @@ Changes Since the <a href="https://www.w3.org/TR/2012/CR-css3-images-20120417/">
 
 	- The <css>image()</css> notation has been deferred to Level 4.
 	- The <css>image-resolution</css> property has been deferred to Level 4
-	- The 'image-orientation' property has been marked as At-Risk.
+	- The 'image-orientation' property has been marked as At-Risk,
+		the ''from-image'' and ''image-orientation/none'' keywords,
+		and the <<angle>> values deprecated.
 	- Added the 'image-rendering' property
 	- Added the ''cross-fade()'' notation
 	- Defined <a href="#interpolation">Interpolation</a>