Merge pull request w3c#166 from frivoal/mutlicol-intrinsic-sizes

Take column gaps into account for multicol intrinsic sizing

css-sizing/Overview.bs

@@ -481,7 +481,8 @@ Min-content Sizes in Multi-column Layout</h3>
 		with a computed 'column-width' of ''column-width/auto''
 		is the largest <a>min-content inline-size contribution</a> of its contents
 		multiplied by its 'column-count'
-		(treating ''column-count/auto'' as ''1'').
+		(treating ''column-count/auto'' as ''1''),
+		plus its 'column-gap' multiplied by 'column-count' minus 1.
 
 <h4 id="multicol-max-content">
 Max-content Sizes in Unconstrained-height Multi-column Layout</h3>
@@ -493,7 +494,8 @@ Max-content Sizes in Unconstrained-height Multi-column Layout</h3>
 		is its 'column-count'
 		multiplied by the larger of
 		its 'column-width' (treating ''column-width/auto'' as zero)
-		and the largest <a>min-content inline-size contribution</a> of its contents.
+		and the largest <a>min-content inline-size contribution</a> of its contents,
+		plus its 'column-gap' multiplied by 'column-count' minus 1.
 
 	<p class="note">
 		Note that the contents of the multi-column element
@@ -506,7 +508,8 @@ Max-content Sizes in Unconstrained-height Multi-column Layout</h3>
 		with unrestrained column heights
 		and a computed 'column-count' of ''column-count/auto''
 		is its 'column-width'
-		multiplied by the number of columns obtained by taking all allowed column breaks [[CSS3-BREAK]].
+		multiplied by the number of columns obtained by taking all allowed column breaks [[CSS3-BREAK]],
+		plus its 'column-gap' multiplied by that same number of columns minus 1.
 
 	<!--
 	The above was decided based on dholbert's example in http://lists.w3.org/Archives/Public/www-style/2012Oct/0017.html .