Move intrinsic-* to the intrinsic sizes chapter, and redefine it as overriding the actual intrinsic size, not just the intrinsic size contribution. Fixes #4414.

Author: tabatkins

css-sizing-4/Overview.bs

@@ -402,9 +402,20 @@ Intrinsic Size Determination</h2>
 
 ISSUE: <strong>Need to Sync This Section With Level 3 It is Super Out Of Date</strong>
 
-	<p>
-		<dfn export>Intrinsic sizing</dfn> determines sizes based on the contents of an element,
-		without regard for its context.
+	<dfn export lt="intrinsic size">Intrinsic sizing</dfn> determines sizes based on the contents of a box,
+	without regard for the context in which it is placed.
+
+	Precisely how to calculate the [=intrinsic size=] of a box depends on its layout mode;
+	the following subsections define intrinsic sizing for several types of layouts.
+	Individual layout modes,
+	such as Flexbox or Grid,
+	can define their own intrinsic sizing rules.
+
+	If a box has an [=explicit intrinsic inner size=] in an axis,
+	then that is all of its [=intrinsic sizes=] in that axis.
+	If the other axis does not have an [=explicit intrinsic inner size=],
+	then its intrinsic sizes are determined normally,
+	without regard for the [=explicit intrinsic inner size=] in the first axis.
 
 
 <h3 id='replaced-intrinsic'>
@@ -605,38 +616,6 @@ Max-content Sizes in Constrained-height Multi-column Layout</h3>
 		and measuring the resulting columns.
 
 
-<!--
- ██████   ███████  ██    ██ ████████ ████████  ████ ████████   ██████
-██    ██ ██     ██ ███   ██    ██    ██     ██  ██  ██     ██ ██    ██
-██       ██     ██ ████  ██    ██    ██     ██  ██  ██     ██ ██
-██       ██     ██ ██ ██ ██    ██    ████████   ██  ████████   ██████
-██       ██     ██ ██  ████    ██    ██   ██    ██  ██     ██       ██
-██    ██ ██     ██ ██   ███    ██    ██    ██   ██  ██     ██ ██    ██
- ██████   ███████  ██    ██    ██    ██     ██ ████ ████████   ██████
--->
-
-<h2 id="intrinsic-contribution">
-Intrinsic Size Contributions</h2>
-
-	A box’s <a>min-content contribution</a>/<a>max-content contribution</a> in each axis
-	is the size of the content box
-	of a hypothetical ''width/auto''-sized float
-	that contains only that box,
-	if that hypothetical float's containing block is zero-sized/infinitely-sized.
-
-	However, if the box has an [=explicit intrinsic inner size=] in an axis,
-	then the box's [=automatic size=] in that axis
-	is calculated by assuming the [=explicit intrinsic inner size=]
-	as its [=inner size=] in that axis.
-
-	Note: This specification does not define precisely how to determine these sizes.
-	Please refer to [[CSS2]],
-	the relevant CSS specification for that display type,
-	the <a href="#percentage-sizing">rules for handling percentages</a> (below),
-	and/or existing implementations
-	for further details.
-
-
 <h3 id='intrinsic-size-override'>
 Overriding Intrinsic Sizes: the 'intrinsic-*' properties</h3>
 
@@ -652,18 +631,18 @@ Overriding Intrinsic Sizes: the 'intrinsic-*' properties</h3>
 	</pre>
 
 	The 'intrinsic-*' properties determine
-	whether the [=intrinsic size contributions=] of a box
+	whether the [=intrinsic sizes=] of a box
 	are calculated from sizes derived from its content
+	(as defined by the rest of this chapter),
 	or from a specified <dfn export>explicit intrinsic inner size</dfn>.
-	See [[#intrinsic-contribution]].
 	Values are defined as follows:
 
 	<dl dfn-type=value dfn-for="intrinsic-block-size, intrinsic-inline-size, intrinsic-height, intrinsic-width, intrinsic-size">
 		: <dfn>legacy</dfn>
 		::
 			Does not specify an [=explicit intrinsic inner size=] of the box
 			in the relevant axis.
-			(Intrinsic size contribution are thus determined in various ways
+			(Intrinsic sizes are thus determined in various ways
 			based on examining the content of the box as usual.
 			See [[#intrinsic]], for example.)
 
@@ -702,6 +681,33 @@ Overriding Intrinsic Sizes: the 'intrinsic-*' properties</h3>
 	we'll apply the same logic here.
 
 
+<!--
+ ██████   ███████  ██    ██ ████████ ████████  ████ ████████   ██████
+██    ██ ██     ██ ███   ██    ██    ██     ██  ██  ██     ██ ██    ██
+██       ██     ██ ████  ██    ██    ██     ██  ██  ██     ██ ██
+██       ██     ██ ██ ██ ██    ██    ████████   ██  ████████   ██████
+██       ██     ██ ██  ████    ██    ██   ██    ██  ██     ██       ██
+██    ██ ██     ██ ██   ███    ██    ██    ██   ██  ██     ██ ██    ██
+ ██████   ███████  ██    ██    ██    ██     ██ ████ ████████   ██████
+-->
+
+<h2 id="intrinsic-contribution">
+Intrinsic Size Contributions</h2>
+
+	A box’s <a>min-content contribution</a>/<a>max-content contribution</a> in each axis
+	is the size of the content box
+	of a hypothetical ''width/auto''-sized float
+	that contains only that box,
+	if that hypothetical float's containing block is zero-sized/infinitely-sized.
+
+	Note: This specification does not define precisely how to determine these sizes.
+	Please refer to [[CSS2]],
+	the relevant CSS specification for that display type,
+	the <a href="#percentage-sizing">rules for handling percentages</a> (below),
+	and/or existing implementations
+	for further details.
+
+
 
 <!--
 ████████ ██     ██ ████████ ████████  ████ ██    ██  ██████  ████  ██████