@@ -96,11 +96,11 @@ Terminology</h2>
9696 <dd>
9797 The <i> fill-available fit</i> into a given size
9898 is that size,
99- minus the element's computed margins (not collapsed, treating ''auto'' as zero),
99+ minus the element's computed margins (not collapsed, treating ''margin/ auto'' as zero),
100100 border, and padding in the given dimension.
101101
102102 <p class='note'>
103- Note: This is the formula used to calculate the ''auto'' widths
103+ Note: This is the formula used to calculate the ''width/ auto'' widths
104104 of non-replaced blocks in normal flow in <a href="http://www.w3.org/TR/CSS21/visudet.html#blockwidth">CSS2.1§10.3.3</a> .
105105
106106 <dt> <dfn title="fallback|fallback size">fallback size</dfn>
@@ -310,7 +310,7 @@ Column Sizing Keywords</h3>
310310 New values : fill | max-content | min-content | fit-content
311311 </pre>
312312
313- <p> When used as values for <a href="http://www.w3.org/TR/css3-multicol/#cw"> 'column-width'</a> ,
313+ <p> When used as values for 'column-width' ,
314314 the new keywords specify the optimal column width:
315315
316316 <dl dfn-type=value dfn-for="column-width">
@@ -351,6 +351,11 @@ Intrinsic Sizes of Replaced Elements</h3>
351351 of the element,
352352 calculated with an unconstrained specified size.
353353
354+ The <a>min-content contribution</a> and <a>max-content contribution</a> in each axis
355+ is the element's specified outer size in that axis, if definite,
356+ and the <a>min-content size</a> , as specified above, plus the element's margin/border/padding in that axis otherwise,
357+ clamped by the element's min and max size properties in that axis.
358+
354359<h3 id='inline-intrinsic'>
355360Intrinsic Sizes of Non-Replaced Inlines</h3>
356361
@@ -440,38 +445,38 @@ Intrinsic Sizes in Multi-column Layout</h3>
440445
441446 <p>
442447 The <i> min-content inline-size</i> of a multi-column element
443- with a computed 'column-width' not ''auto''
448+ with a computed 'column-width' not ''column-width/ auto''
444449 is the smaller of
445450 its 'column-width'
446451 and the largest <i> min-content inline-size contribution</i> of its contents.
447452
448453 <p>
449454 The <i> min-content inline-size</i> of a multi-column element
450- with a computed 'column-width' of ''auto''
455+ with a computed 'column-width' of ''column-width/ auto''
451456 is the largest <i> min-content inline-size contribution</i> of its contents
452457 multiplied by its 'column-count'
453- (treating ''auto'' as ''1'' ).
458+ (treating ''column-count/ auto'' as ''1'' ).
454459
455460 <p>
456461 The <i> max-content inline-size</i> of a multi-column element
457462 with unrestrained column heights
458- and a computed 'column-count' not ''auto''
463+ and a computed 'column-count' not ''column-count/ auto''
459464 is its 'column-count'
460465 multiplied by the larger of
461- its 'column-width' (treating ''auto'' as 0)
466+ its 'column-width' (treating ''column-width/ auto'' as 0)
462467 and the largest <i> max-content inline-size contribution</i> of its contents.
463468
464469 <p>
465470 The <i> max-content inline-size</i> of a multi-column element
466471 with unrestrained column heights
467- and a computed 'column-count' of ''auto''
472+ and a computed 'column-count' of ''column-count/ auto''
468473 is its 'column-width'
469474 multiplied by the number of columns obtained by taking all allowed column breaks [[CSS3-BREAK]] .
470475
471476 <!--
472477 The above was decided based on dholbert's example in http://lists.w3.org/Archives/Public/www-style/2012Oct/0017.html .
473478 These definitions make multicols work well in flexbox,
474- both in 'stretch' and non-'stretch' cases,
479+ both in '' stretch'' and non-'' stretch' ' cases,
475480 without wasted space or needless overflow.
476481 -->
477482
@@ -483,7 +488,7 @@ Intrinsic Sizes in Multi-column Layout</h3>
483488
484489 <ul>
485490 <li>
486- Laying out the element with column-spanning elements given 'display: none' ,
491+ Laying out the element with column-spanning elements given '' display: none' ' ,
487492 and taking a inline-size that includes all the columns.
488493
489494 <li>
@@ -511,7 +516,7 @@ Intrinsic Sizes in Multi-column Layout</h3>
511516
512517 <p>
513518 The <i> preferred inline-size</i> of a multi-column element
514- with non-''auto'' 'column-width' and 'column-count'
519+ with non-''column-width/ auto'' 'column-width' and 'column-count'
515520 is the product of the 'column-width' and 'column-count' ,
516521 plus the appropriate amount of column gaps.
517522 In all other cases,
@@ -538,7 +543,7 @@ Extrinsic Size Determination</h2>
538543 </ul>
539544 <p>
540545 …less the box's <i> inline-axis</i> margins
541- (after any <a href="http://www.w3.org/TR/CSS21/box.html#collapsing-margins">margin collapsing</a> , and treating ''auto'' margins as zero),
546+ (after any <a href="http://www.w3.org/TR/CSS21/box.html#collapsing-margins">margin collapsing</a> , and treating ''margin/ auto'' margins as zero),
542547 borders, and padding.
543548
544549 <p>
0 commit comments