More constraints for width/height calculation. Still need to handle

minmax better. Probably need to define 'max-content' and 'min-content'
outside of the list.

Author: bert-github

css3-layout/new.src.html

@@ -1097,12 +1097,12 @@ <h3 id="grid-templates">
   <var>M</var> rows, the implicit template is equivalent to
   <var>M</var> strings of <var>N</var> asterisks:
 
-  <pre>
-"***&hellip;***"
-"***&hellip;***"
-&#8942;
-"***&hellip;***"
-</pre>
+  <blockquote>
+   <p><code>"***</code>&hellip;<code>***"</code><br>
+   <code>"***</code>&hellip;<code>***"</code><br>
+   &#8942;<br>
+   <code>"***</code>&hellip;<code>***"</code>
+  </blockquote>
 
   <p class=note>Note that an element is a grid element in this case if
   'grid-columns' and 'grid-rows' are not both ''auto''.
@@ -1316,9 +1316,11 @@ <h3>Default slots</h3>
   default. If there is no asterisk, then the first letter in the
   template defines the default slot.
 
-  <p class=example>For example, if the template is defined by
+  <div class=example>
+  <p>For example, if the template is defined by
   'grid-template: "..." "..c" "abb" "abb"', then “c” is the default
   slot.
+  </div>
 
   <p>If the grid has an <em>implicit template</em> (i.e.,
   'grid-template' is ''none''), then the default slot is the single,
@@ -1408,12 +1410,12 @@ <h4 id="computed-values-grid-rows-and-columns">
 
 
 <h3 id="slot-sizes">
-Calculating the widths and heights of the slots</h3>
+Calculating the size of the grid</h3>
 
 <p>The UA must choose the widths and heights of all columns and rows
 such that the following constraints are satisfied.
 
-<ul>
+<ol>
   <li>If the element has an a-priori known content height, then the
   sum of the heights of all rows must be equal to the element's
   height.
@@ -1452,15 +1454,26 @@ <h3 id="slot-sizes">
   the preferred intrinsic width of that slot, as defined in
   [[!CSS3BOX]], plus the slot's horizontal padding, border and margin.
 
+  <li>Each <em>vertical</em> slot that spans at least one column with
+  a width specified as 'max-content', 'min-content' or 'fit-content',
+  must have a width at least as large as the slot's <em>block
+  dimension.</em>
+
+  <li>Each <em>horizontal</em> slot that spans at least one row with a
+  height specified as 'max-content', 'min-content' or 'fit-content',
+  must have a height at least as large as the slot's <em>block
+  dimension.</em>
+
   <li>Each <em>vertical</em> slot that spans at least one row with a
-  height specified as 'min-content' must be at least as high as the
-  preferred minimum height of that slot, as defined in [[!CSS3BOX]],
-  plus the slot's vertical padding, border and margin.
+  height specified as 'min-content' or 'fit-content' must be at least
+  as high as the preferred minimum height of that slot, as defined in
+  [[!CSS3BOX]], plus the slot's vertical padding, border and margin.
 
-  <li>Each <em>horizontal</em> slot that spans at least one columns
-  with a height specified as 'min-content' must be at least as wide as
-  the preferred minimum width of that slot, as defined in
-  [[!CSS3BOX]], plus the slot's horizontal padding, border and margin.
+  <li>Each <em>horizontal</em> slot that spans at least one column
+  with a width specified as 'min-content' or 'fit-content' must be at
+  least as wide as the preferred minimum width of that slot, as
+  defined in [[!CSS3BOX]], plus the slot's horizontal padding, border
+  and margin.
 
 
   <li>All rows with a height specified as '*' must have the same
@@ -1483,7 +1496,7 @@ <h3 id="slot-sizes">
   w<sub>j</sub> = W<sub>j</sub> * W<sub>i</sub>. (I.e., their widths
   are proportional to their number of 'fr' units.)
 
-</ul>
+</ol>
 
 <p>If it is impossible to choose such widths and heights, then try
 without constraint 1. If it is still impossible, try without