[css-contain-2][css-contain-3] Rephrase containment exceptions into a list, and move to bottom of each section.

Author: tabatkins

css-contain-2/Overview.bs

@@ -506,49 +506,7 @@ Types of Containment</h2>
 <h3 id='containment-size'>
 Size Containment</h3>
 
-	If the element does not generate a <a>principal box</a> (as is the case with ''display: contents'' or ''display: none''),
-	or its [=inner display type=] is ''display/table'',
-	or its principal box is an <a spec="css-display-3">internal table box</a>,
-	or an <a spec="css-display-3">internal ruby box</a>,
-	or a <a spec="css-display-3" lt="atomic inline">non-atomic</a> <a spec="css-display-3">inline-level</a> box,
-	size containment has no effect.
-
-	<wpt>
-	contain-size-001.html
-	contain-size-002.html
-	contain-size-003.html
-	contain-size-004.html
-	contain-size-005.html
-	contain-size-006.html
-	contain-size-007.html
-	contain-size-008.html
-	contain-size-009.html
-	contain-size-010.html
-	contain-size-012.html
-	contain-size-012b.html
-	contain-size-051.html
-	contain-size-052.html
-	</wpt>
-
-	Note: Internal table boxes,
-	which do not include table captions,
-	are excluded,
-	because the table layout algorithm
-	does not allow boxes to become smaller than their inflow content.
-	Sizing a table cell as if it was empty and then layout out its content inside without changing the size
-	is effectively an undefined operation.
-	Manually setting the 'width' or 'height' properties to ''0''
-	cannot make it smaller than its content.
-	This concern does not apply to table captions,
-	which are perfectly capable of having a fixed size
-	that is independent of their content.
-
-	<wpt>
-	contain-size-011.html
-	contain-size-056.html
-	</wpt>
-
-	Otherwise, giving an element <dfn export>size containment</dfn>
+	Giving an element <dfn export>size containment</dfn>
 	makes its [=principal box=] a <dfn>size containment box</dfn>
 	and has the following effects:
 
@@ -700,6 +658,52 @@ Size Containment</h3>
 		and its [=natural height=] is treated as 0.
 	</div>
 
+	However, giving an element [=size containment=]
+	has no effect if any of the following are true:
+
+	* if the element does not generate a <a>principal box</a>
+		(as is the case with ''display: contents'' or ''display: none'')
+	* if its [=inner display type=] is ''display/table''
+	* if its [=principal box=] is 
+		an <a spec="css-display-3">internal table box</a>
+	* if its [=principal box=] is 
+		an <a spec="css-display-3">internal ruby box</a>
+		or a <a spec="css-display-3" lt="atomic inline">non-atomic</a> <a spec="css-display-3">inline-level</a> box
+
+	<wpt>
+	contain-size-001.html
+	contain-size-002.html
+	contain-size-003.html
+	contain-size-004.html
+	contain-size-005.html
+	contain-size-006.html
+	contain-size-007.html
+	contain-size-008.html
+	contain-size-009.html
+	contain-size-010.html
+	contain-size-012.html
+	contain-size-012b.html
+	contain-size-051.html
+	contain-size-052.html
+	</wpt>
+
+	Note: Internal table boxes,
+	which do not include table captions,
+	are excluded,
+	because the table layout algorithm
+	does not allow boxes to become smaller than their inflow content.
+	Sizing a table cell as if it was empty and then laying out its content inside without changing the size
+	is effectively an undefined operation.
+	Manually setting the 'width' or 'height' properties to ''0''
+	cannot make it smaller than its content.
+	This concern does not apply to table captions,
+	which are perfectly capable of having a fixed size
+	that is independent of their content.
+
+	<wpt>
+	contain-size-011.html
+	contain-size-056.html
+	</wpt>
 
 <h4 id='containment-size-opt' class="no-toc">
 Possible Size-Containment Optimizations</h4>
@@ -731,12 +735,7 @@ Possible Size-Containment Optimizations</h4>
 <h3 id='containment-layout'>
 Layout Containment</h3>
 
-	If the element does not generate a <a>principal box</a> (as is the case with 'display' values of ''display/contents'' or ''display/none''),
-	or its [=principal box=] is an <a spec="css-display-3">internal table box</a> other than ''display/table-cell'',
-	or an <a spec="css-display-3">internal ruby box</a>,
-	or a <a spec="css-display-3" lt="atomic inline">non-atomic</a> <a spec="css-display-3">inline-level</a> box,
-	layout containment has no effect.
-	Otherwise, giving an element <dfn export>layout containment</dfn>
+	Giving an element <dfn export>layout containment</dfn>
 	makes its [=principal box=] a <dfn>layout containment box</dfn>
 	and has the following effects:
 
@@ -886,6 +885,18 @@ Layout Containment</h3>
 		contain-layout-baseline-005.html
 		</wpt>
 
+	However, giving an element [=layout containment=]
+	has no effect if any of the following are true:
+
+	* if the element does not generate a <a>principal box</a>
+		(as is the case with ''display: contents'' or ''display: none'')
+	* if its [=principal box=] is 
+		an <a spec="css-display-3">internal table box</a>
+		other than ''display/table-cell''
+	* if its [=principal box=] is 
+		an <a spec="css-display-3">internal ruby box</a>
+		or a <a spec="css-display-3" lt="atomic inline">non-atomic</a> <a spec="css-display-3">inline-level</a> box
+
 <h4 id='containment-layout-opt' class="no-toc">
 Possible Layout-Containment Optimizations</h4>
 
@@ -1017,12 +1028,7 @@ Possible Style-Containment Optimizations</h4>
 <h3 id='containment-paint'>
 Paint Containment</h3>
 
-	If the element does not generate a <a>principal box</a> (as is the case with 'display' values of ''display/contents'' or ''display/none''),
-	or its [=principal box=] is an <a spec="css-display-3">internal table box</a> other than ''display/table-cell'',
-	or an <a spec="css-display-3">internal ruby box</a>,
-	or a <a spec="css-display-3" lt="atomic inline">non-atomic</a> <a spec="css-display-3">inline-level</a> box,
-	paint containment has no effect.
-	Otherwise, giving an element <dfn export>paint containment</dfn>
+	Giving an element <dfn export>paint containment</dfn>
 	makes its [=principal box=] a <dfn>paint containment box</dfn>
 	and has the following effects:
 
@@ -1111,6 +1117,18 @@ Paint Containment</h3>
 	contain-paint-baseline-001.html
 	</wpt>
 
+	However, giving an element [=paint containment=]
+	has no effect if any of the following are true:
+
+	* if the element does not generate a <a>principal box</a>
+		(as is the case with ''display: contents'' or ''display: none'')
+	* if its [=principal box=] is 
+		an <a spec="css-display-3">internal table box</a>
+		other than ''display/table-cell''
+	* if its [=principal box=] is 
+		an <a spec="css-display-3">internal ruby box</a>
+		or a <a spec="css-display-3" lt="atomic inline">non-atomic</a> <a spec="css-display-3">inline-level</a> box
+
 <h4 id='containment-paint-opt' class="no-toc">
 Possible Paint-Containment Optimizations</h4>
 

css-contain-3/Overview.bs

@@ -100,15 +100,7 @@ Types of Containment</h2>
 <h3 id='containment-inline-size'>
 Inline-Size Containment</h3>
 
-	If the element does not generate a <a>principal box</a>
-	(as is the case with ''display: contents'' or ''display: none''),
-	or its [=inner display type=] is ''display/table'',
-	or its [=principal box=] is an <a spec="css-display-3">internal table box</a>,
-	or an <a spec="css-display-3">internal ruby box</a>,
-	or a <a spec="css-display-3" lt="atomic inline">non-atomic</a> <a spec="css-display-3">inline-level</a> box,
-	[=inline-size containment=] has no effect.
-
-	Otherwise, giving an element <dfn export>inline-size containment</dfn>
+	Giving an element <dfn export>inline-size containment</dfn>
 	applies [=size containment=] to the [=inline-axis=] sizing of its [=principal box=].
 	This means the [=inline-axis=] [=intrinsic sizes=] of the [=principal box=]
 	are determined as if the element had no content.
@@ -242,6 +234,18 @@ Inline-Size Containment</h3>
 		</div>
 	</div>
 
+	However, giving an element [=inline-size containment=]
+	has no effect if any of the following are true:
+
+	* if the element does not generate a <a>principal box</a>
+		(as is the case with ''display: contents'' or ''display: none'')
+	* if its [=inner display type=] is ''display/table''
+	* if its [=principal box=] is 
+		an <a spec="css-display-3">internal table box</a>
+	* if its [=principal box=] is 
+		an <a spec="css-display-3">internal ruby box</a>
+		or a <a spec="css-display-3" lt="atomic inline">non-atomic</a> <a spec="css-display-3">inline-level</a> box
+
 	Issue(1031): Define inline-size containment in more detail
 	(including additional examples)