[css-sizing] Remove 'preferred size' concept, fold definition into max-content.

Author: fantasai

css-sizing/Overview.bs

@@ -131,20 +131,23 @@ Auto Box Sizes</h3>
 			and computed by the rules in <a href="http://www.w3.org/TR/CSS21/visudet.html#blockwidth">CSS2.1§10.3.3</a>.
 
 		: <dfn>max-content size</dfn>
-		:: Roughly, the smallest <a>size</a> a box could take in a given axis
+		:: A box’s “ideal” <a>size</a> in a given axis when given infinite available space.
+			Usually this is the smallest <a>size</a> the box could take in that axis
 			while still fitting around its contents,
 			i.e. minimizing unfilled space while avoiding overflow.
 
 			: <dfn>max-content inline size</dfn>
-			:: Roughly, the narrowest <a>inline size</a> a box could take while fitting around its contents
+			:: The box's “ideal” <a>size</a> in the <a>inline axis</a>.
+				Usually the narrowest <a>inline size</a> it could take while fitting around its contents
 				if <em>none</em> of the soft wrap opportunities within the box were taken.
 				(See [[#intrinsic]].)
 
 				Note: This is called the “preferred width” in <a href="http://www.w3.org/TR/CSS21/visudet.html#float-width">CSS2.1§10.3.5</a>
 				and the “maximum cell width” in <a href="http://www.w3.org/TR/CSS21/tables.html#auto-table-layout">CSS2.1§17.5.2.2</a>.
 
 			: <dfn>max-content block size</dfn>
-			:: Roughly, the <a>block size</a> of the content after layout.
+			:: The box's “ideal” <a>size</a> in the <a>inline axis</a>.
+				Usually the <a>block size</a> of the content after layout.
 
 		: <dfn>min-content size</dfn>
 		:: The smallest <a>size</a> a box could take
@@ -174,17 +177,11 @@ Auto Box Sizes</h3>
 		: <dfn>fit-content inline size</dfn>
 		: <dfn>fit-content block size</dfn>
 		:: If the <a>available size</a> in a given axis is finite,
-			equal to <code>min(<a>preferred size</a>, max(<a>min-content size</a>, <a>fill-available size</a>))</code>.
+			equal to <code>min(<a>max-content size</a>, max(<a>min-content size</a>, <a>fill-available size</a>))</code>.
 			Otherwise, equal to the <a>max-content size</a> in that axis.
 
 			Note: This is called the “shrink-to-fit” width in <a href="http://www.w3.org/TR/CSS21/visudet.html#float-width">CSS2.1§10.3.5</a>
 			and <a href="http://www.w3.org/TR/css3-multicol/#pseudo-algorithm">CSS Multi-column Layout § 3.4</a>.
-
-		: <dfn>preferred size</dfn>
-		: <dfn>preferred inline size</dfn>
-		: <dfn>preferred block size</dfn>
-		:: A box’s “ideal” <a>size</a> in a given axis.
-			Unless otherwise specified, this is the <a>max-content size</a>.
 	</div>
 
 <h3 id='contributions'>
@@ -198,11 +195,6 @@ Intrinsic Size Contributions</h3>
 		<dt><dfn lt="min-content contribution|min-content inline-size contribution|min-content block-size contribution">min-content contribution</dfn>
 		<dd>
 			The size that a box contributes to its <a>containing block</a>'s <a>min-content size</a>.
-
-		<dt><dfn>preferred-size contribution</dfn>
-		<dd>
-			If the box's layout mode has a defined <a>preferred-size contribution</a>, that.
-			Otherwise, the box's <a>max-content contribution</a>.
 	</dl>
 
 <h3 id='constraints'>
@@ -218,11 +210,6 @@ Intrinsic Size Constraints</h3>
 		<dd>
 			A sizing constraint imposed by the box's <a>containing block</a>
 			that causes it to produce its <a>min-content contribution</a>.
-
-		<dt><dfn>preferred-size constraint</dfn>
-		<dd>
-			A sizing constraint imposed by the box's <a>containing block</a>
-			that causes it to produce its <a>preferred-size contribution</a>.
 	</dl>
 
 <h2 id='size-keywords'>
@@ -453,6 +440,10 @@ Intrinsic Sizes in Table Layout</h3>
 <h3 id="multicol-intrinsic">
 Intrinsic Sizes in Multi-column Layout</h3>
 
+
+<h4 id="multicol-min-content">
+Min-content Sizes in Multi-column Layout</h3>
+
 	<p>
 		The <a>min-content inline size</a> of a multi-column element
 		with a computed 'column-width' not ''column-width/auto''
@@ -467,14 +458,23 @@ Intrinsic Sizes in Multi-column Layout</h3>
 		multiplied by its 'column-count'
 		(treating ''column-count/auto'' as ''1'').
 
+<h4 id="multicol-max-content">
+Max-content Sizes in Unconstrained-height Multi-column Layout</h3>
+
 	<p>
 		The <a>max-content inline size</a> of a multi-column element
 		with unrestrained column heights
 		and a computed 'column-count' not ''column-count/auto''
 		is its 'column-count'
 		multiplied by the larger of
 		its 'column-width' (treating ''column-width/auto'' as zero)
-		and the largest <a>max-content inline-size contribution</a> of its contents.
+		and the largest <a>min-content inline-size contribution</a> of its contents.
+
+	<p class="note">
+		Note that the contents of the multi-column element
+		can still grow to be wider and shorter
+		if the resulting column width is still smaller
+		than the largest <a>max-content inline-size contribution</a> of its contents.
 
 	<p>
 		The <a>max-content inline size</a> of a multi-column element
@@ -490,6 +490,9 @@ Intrinsic Sizes in Multi-column Layout</h3>
 	without wasted space or needless overflow.
 	-->
 
+<h4 id="multicol-max-content-restrained">
+Max-content Sizes in Constrained-height Multi-column Layout</h3>
+
 	<p>
 		The <a>max-content inline size</a> of a multi-column element
 		with restrained-height columns (i.e. a specified 'height' or 'max-height', or whichever properties map to the <a>block size</a> of the element)
@@ -524,16 +527,6 @@ Intrinsic Sizes in Multi-column Layout</h3>
 		this approximation collapses to simply doing a layout,
 		and measuring the resulting columns.
 
-	<p>
-		The <a>preferred inline size</a> of a multi-column element
-		with non-''column-width/auto'' 'column-width' and 'column-count'
-		is the product of the 'column-width' and 'column-count',
-		plus the appropriate amount of column gaps.
-		In all other cases,
-		it is the <a>max-content inline size</a>.
-
-
-
 <h2 id='extrinsic'>
 Extrinsic Size Determination</h2>
 
@@ -590,7 +583,6 @@ Changes</h2>
 
 	<ul>
 		<li>Changed <code>fill-available</code> keyword to <code>fill</code>.
-		<li>Defined <a>preferred size</a> concept.
 		<li>Hooked up intrinsic sizes of replaced elements to the <a>default sizing algorithm</a> in [[!CSS3-IMAGES]].
 		<li>Specified that <a>extrinsic sizing</a> treates ''margin/auto'' margins as zero.
 		<li>Clarified definition of <a>available size</a>.