Let's actually regen the right spec, hm?

Author: tabatkins

css-variables/Overview.html

@@ -21,15 +21,15 @@
 
    <h1>CSS Variables Module Level 1</h1>
 
-   <h2 class="no-num no-toc" id=longstatus-date>Editor's Draft 9 May 2012</h2>
+   <h2 class="no-num no-toc" id=longstatus-date>Editor's Draft 10 May 2012</h2>
 
    <dl>
     <dt>This version:
-     <!--<dd><a href="http://www.w3.org/TR/2012/WD-css-variables-20120509/">http://www.w3.org/TR/2012/ED-css-variables-20120509/</a>-->
+     <!--<dd><a href="http://www.w3.org/TR/2012/WD-css-variables-20120510/">http://www.w3.org/TR/2012/ED-css-variables-20120510/</a>-->
 
 
     <dd><a href="http://dev.w3.org/csswg/css-variables/">Editor's draft</a>
-     (version of 9 May 2012)
+     (version of 10 May 2012)
 
     <dt>Latest version:
 

css3-flexbox/Overview.html

@@ -30,11 +30,11 @@
 
    <h1 id=head-box-flexible>CSS Flexible Box Layout Module</h1>
 
-   <h2 class="no-num no-toc" id=w3c-working>Editor's Draft, 9 May 2012</h2>
+   <h2 class="no-num no-toc" id=w3c-working>Editor's Draft, 10 May 2012</h2>
 
    <dl>
     <dt>This version:
-     <!--<dd><a href="http://www.w3.org/TR/2012/ED-css3-flexbox-20120509/">http://www.w3.org/TR/2012/WD-css3-flexbox-20120509/</a>-->
+     <!--<dd><a href="http://www.w3.org/TR/2012/ED-css3-flexbox-20120510/">http://www.w3.org/TR/2012/WD-css3-flexbox-20120510/</a>-->
 
 
     <dd><a
@@ -870,7 +870,8 @@ <h3 id=flex-direction><span class=secno>6.1. </span> Flexbox Flow
     <tr>
      <th>Canonical Order:
 
-     <td>as specified
+     <td><abbr title="follows order of property value definition">per
+      grammar</abbr>
   </table>
 
   <p> The &lsquo;<a href="#flex-direction0"><code
@@ -974,7 +975,8 @@ <h3 id=flex-wrap><span class=secno>6.2. </span> Flexbox Wrapping: the
     <tr>
      <th>Canonical Order:
 
-     <td>as specified
+     <td><abbr title="follows order of property value definition">per
+      grammar</abbr>
   </table>
 
   <p> The &lsquo;<a href="#flex-wrap0"><code
@@ -1072,7 +1074,8 @@ <h3 id=flex-flow><span class=secno>6.3. </span> Flex Direction and Wrap:
     <tr>
      <th>Canonical Order:
 
-     <td>as specified
+     <td><abbr title="follows order of property value definition">per
+      grammar</abbr>
   </table>
 
   <p>The &lsquo;<a href="#flex-flow0"><code
@@ -1175,7 +1178,8 @@ <h3 id=flex-order><span class=secno>6.4. </span> Display Order: the
     <tr>
      <th>Canonical Order:
 
-     <td>as specified
+     <td><abbr title="follows order of property value definition">per
+      grammar</abbr>
   </table>
 
   <p>The &lsquo;<a href="#flex-order0"><code
@@ -1275,9 +1279,10 @@ <h2 id=flexibility><span class=secno>7. </span> Flexibility: the &lsquo;<a
    href="#flexbox-item"><i>flexbox items</i></a> "flex", altering their width
    or height to fill the available space. This is done with the &lsquo;<a
    href="#flex"><code class=property>flex</code></a>&rsquo; property. A
-   flexbox distributes free space to its items proportional to their positive
-   flexibility, or shrinks them to prevent overflow proportional to their
-   negative flexibility.
+   flexbox distributes free space to its items proportional to their <a
+   href="#positive-flexibility"><i>positive flex ratio</i></a>, or shrinks
+   them to prevent overflow proportional to their <a
+   href="#negative-flex-ratio"><i>negative flex ratio</i></a>.
 
   <table class=propdef>
    <tbody>
@@ -1310,8 +1315,7 @@ <h2 id=flexibility><span class=secno>7. </span> Flexibility: the &lsquo;<a
     <tr>
      <th>Computed Value:
 
-     <td>Two numbers for positive and negative flex, and a flex basis given
-      either as an absolute length or a keyword.
+     <td>see individual properties
 
     <tr>
      <th>Media:
@@ -1445,7 +1449,8 @@ <h3 id=flex-components><span class=secno>7.1. </span> Components of
     <tr>
      <th>Canonical Order:
 
-     <td>as specified
+     <td><abbr title="follows order of property value definition">per
+      grammar</abbr>
   </table>
 
   <p> The &lsquo;<a href="#flex-grow"><code
@@ -1499,7 +1504,8 @@ <h3 id=flex-components><span class=secno>7.1. </span> Components of
     <tr>
      <th>Canonical Order:
 
-     <td>as specified
+     <td><abbr title="follows order of property value definition">per
+      grammar</abbr>
   </table>
 
   <p> The &lsquo;<a href="#flex-shrink"><code
@@ -1537,7 +1543,7 @@ <h3 id=flex-components><span class=secno>7.1. </span> Components of
     <tr>
      <th>Computed Value:
 
-     <td>specified value
+     <td>an absolute length, or a percentage or a keyword as specified
 
     <tr>
      <th>Media:
@@ -1553,7 +1559,8 @@ <h3 id=flex-components><span class=secno>7.1. </span> Components of
     <tr>
      <th>Canonical Order:
 
-     <td>as specified
+     <td><abbr title="follows order of property value definition">per
+      grammar</abbr>
   </table>
 
   <p> The &lsquo;<a href="#flex-basis0"><code
@@ -1562,7 +1569,7 @@ <h3 id=flex-components><span class=secno>7.1. </span> Components of
 
   <p> If the <var>&lt;&apos;width&apos;></var> component is &lsquo;<code
    class=css>auto</code>&rsquo; on a child of a <a
-   href="#flexbox"><i>flexbox</i></a>, the <a href="#flex-basis"><i>flex
+   href="#flexbox"><i>flexbox</i></a>, the used <a href="#flex-basis"><i>flex
    basis</i></a> is the computed value of the <a
    href="#main-size-property"><i>main size property</i></a>.
 
@@ -1691,7 +1698,8 @@ <h3 id=flex-pack><span class=secno>8.2. </span> Axis Alignment: the
     <tr>
      <th>Canonical Order:
 
-     <td>as specified
+     <td><abbr title="follows order of property value definition">per
+      grammar</abbr>
   </table>
 
   <p> The &lsquo;<a href="#flex-pack0"><code
@@ -1831,7 +1839,8 @@ <h3 id=flex-align><span class=secno>8.3. </span> Cross-axis Alignment: the
     <tr>
      <th>Canonical Order:
 
-     <td>as specified
+     <td><abbr title="follows order of property value definition">per
+      grammar</abbr>
   </table>
 
   <table class=propdef>
@@ -1881,7 +1890,8 @@ <h3 id=flex-align><span class=secno>8.3. </span> Cross-axis Alignment: the
     <tr>
      <th>Canonical Order:
 
-     <td>as specified
+     <td><abbr title="follows order of property value definition">per
+      grammar</abbr>
   </table>
 
   <p> <a href="#flexbox-item"><i>Flexbox items</i></a> can be aligned in the
@@ -2053,7 +2063,8 @@ <h3 id=flex-line-pack><span class=secno>8.4. </span> &lsquo;<a
     <tr>
      <th>Canonical Order:
 
-     <td>as specified
+     <td><abbr title="follows order of property value definition">per
+      grammar</abbr>
   </table>
 
   <p>The &lsquo;<a href="#flex-line-pack0"><code
@@ -2202,9 +2213,13 @@ <h2 id=layout-algorithm><span class=secno>9. </span> Flexbox Layout
 	-->
 
 
-  <p> A size is <dfn id=definite title="definite|indefinite">definite</dfn>
-   if it is a <var>&lt;length></var>, or it is a <var>&lt;percentage></var>
-   that is resolved against a definite size.
+  <p> For the purposes of these definitions, a <dfn id=definite-size
+   title="definite|definite size">definite size</dfn> is one that can be
+   determined without measuring content, i.e. is a &lt;length>, a size of the
+   initial containing block, or a &lt;percentage> that is resolved against a
+   definite size. An <dfn id=indefinite-size
+   title="indefinite|indefinite size">indefinite size</dfn> is one that is
+   not <a href="#definite-size"><i>definite</i></a>.
 
   <p> The following sections define the algorithm for laying out a flexbox
    and its contents.
@@ -2233,21 +2248,22 @@ <h3 id=line-sizing><span class=secno>9.2. </span> Line Length Determination</h3>
   <ol start=2>
    <li id=algo-available> <strong>Determine the available main and cross
     space for the flexbox items.</strong> For each dimension, if that
-    dimension of the flexbox is a <i>definite size</i>, use that; otherwise,
-    subtract the flexbox's margin, border, and padding from the space
-    available to the flexbox in that dimension and use that value. <span
-    class=note>This might result in an infinite value.</span>
+    dimension of the flexbox is a <a href="#definite-size"><i>definite
+    size</i></a>, use that; otherwise, subtract the flexbox's margin, border,
+    and padding from the space available to the flexbox in that dimension and
+    use that value. <span class=note>This might result in an infinite
+    value.</span>
 
    <li id=algo-main-item> <strong>Determine the hypothetical main size of
     each item:</strong>
     <ul>
-     <li> If the item has a <a href="#definite"><i>definite</i></a> flex
+     <li> If the item has a <a href="#definite-size"><i>definite</i></a> flex
       basis, that's the hypothetical size.
 
      <li> Otherwise, if the flexbox's main-axis is parallel to the item's
       inline-axis, lay out the item using its flex basis and the available
       space, treating &lsquo;<code class=css>auto</code>&rsquo; as
-      &lsquo;<code class=css>fit-content</code>&rsquo; unless the item's
+      &lsquo;<code class=css>max-content</code>&rsquo; unless the item's
       writing mode is perpendicular to the flexbox's writing mode (in which
       case <a
       href="http://www.w3.org/TR/css3-writing-modes/#orthogonal-flows">the
@@ -2262,7 +2278,7 @@ <h3 id=line-sizing><span class=secno>9.2. </span> Line Length Determination</h3>
 
      <li> Otherwise, lay out the item using the available space, treating
       &lsquo;<code class=css>auto</code>&rsquo; as &lsquo;<code
-      class=css>fit-content</code>&rsquo; unless the item's writing mode is
+      class=css>max-content</code>&rsquo; unless the item's writing mode is
       perpendicular to the flexbox's writing mode (in which case <a
       href="http://www.w3.org/TR/css3-writing-modes/#orthogonal-flows">the
       rules for a box in an orthogonal flow</a> <a href="#CSS3-WRITING-MODES"
@@ -2333,12 +2349,14 @@ <h3 id=cross-sizing><span class=secno>9.4. </span> Cross size determination</h3>
     line.</strong> For each flexbox line:
     <ol>
      <li> Collect all the flexbox items whose inline-axis is parallel to the
-      main-axis and whose &lsquo;<a href="#flex-item-align"><code
+      main-axis, whose &lsquo;<a href="#flex-item-align"><code
       class=property>flex-item-align</code></a>&rsquo; is &lsquo;<code
-      class=css>baseline</code>&rsquo;. Find the largest of the distances
-      between each item's baseline and its hypothetical outer cross-start
-      edge, and the largest of the distances between each item's baseline and
-      its hypothetical outer cross-end edge, and sum these two values.
+      class=css>baseline</code>&rsquo;, and whose cross-axis margins are both
+      non-&lsquo;<code class=css>auto</code>&rsquo;. Find the largest of the
+      distances between each item's baseline and its hypothetical outer
+      cross-start edge, and the largest of the distances between each item's
+      baseline and its hypothetical outer cross-end edge, and sum these two
+      values.
 
      <li> Among all the items not collected by the previous step, find the
       largest hypothetical outer cross-size.
@@ -2347,8 +2365,8 @@ <h3 id=cross-sizing><span class=secno>9.4. </span> Cross size determination</h3>
       found in the previous two steps.
     </ol>
 
-    <p> If the flexbox has a <a href="#definite"><i>definite</i></a> cross
-     size, &lsquo;<a href="#flex-line-pack0"><code
+    <p> If the flexbox has a <a href="#definite-size"><i>definite</i></a>
+     cross size, &lsquo;<a href="#flex-line-pack0"><code
      class=property>flex-line-pack</code></a>&rsquo; is &lsquo;<code
      class=css>stretch</code>&rsquo;, and the sum of the flexbox lines' cross
      sizes is less than the flexbox's inner cross size, increase the cross
@@ -2400,7 +2418,7 @@ <h3 id=cross-alignment><span class=secno>9.6. </span> Cross-Axis Alignment</h3>
     size:</strong>
     <ul>
      <li> If the cross size property is a <a
-      href="#definite"><i>definite</i></a> size, use that.
+      href="#definite-size"><i>definite</i></a> size, use that.
 
      <li> Otherwise, use the sum of the flexbox lines' cross sizes.
     </ul>
@@ -2419,8 +2437,9 @@ <h3 id=resolve-flexible-lengths><span class=secno>9.7. </span> Resolving
    <li> <strong>Determine the used flexibility.</strong> Sum the hypothetical
     outer main sizes of all items on the line, clamped according to their min
     and max main size properties. If the sum is greater than the flexbox's
-    inner main size, use positive flexibility for the rest of this algorithm;
-    otherwise, use negative flexibility.
+    inner main size, use the <a href="#positive-flexibility"><i>positive flex
+    ratio</i></a> for the rest of this algorithm; otherwise, use the <a
+    href="#negative-flex-ratio"><i>negative flex ratio</i></a>.
 
    <li> <strong>Check that you can distribute any space.</strong> If all the
     flexbox items on the line are either frozen or have a flexibility of
@@ -3002,8 +3021,7 @@ <h2 class=no-num id=property>Property index</h2>
 
      <td>see individual properties
 
-     <td>Two numbers for positive and negative flex, and a flex basis given
-      either as an absolute length or a keyword.
+     <td>see individual properties
 
      <td>visual
 
@@ -3033,7 +3051,7 @@ <h2 class=no-num id=property>Property index</h2>
 
      <td>no
 
-     <td>specified value
+     <td>an absolute length, or a percentage or a keyword as specified
 
      <td>visual
 
@@ -3217,7 +3235,11 @@ <h2 class=no-num id=index>Index</h2>
    <li>cross-start, <a href="#cross-start"
     title=cross-start><strong>2.</strong></a>
 
-   <li>definite, <a href="#definite" title=definite><strong>9.</strong></a>
+   <li>definite, <a href="#definite-size"
+    title=definite><strong>9.</strong></a>
+
+   <li>definite size, <a href="#definite-size"
+    title="definite size"><strong>9.</strong></a>
 
    <li>&lsquo;<code class=css>distribute</code>&rsquo;, <a
     href="#flex-line-pack-distribute"
@@ -3289,9 +3311,12 @@ <h2 class=no-num id=index>Index</h2>
    <li>flex-wrap, <a href="#flex-wrap0"
     title=flex-wrap><strong>6.2.</strong></a>
 
-   <li>indefinite, <a href="#definite"
+   <li>indefinite, <a href="#indefinite-size"
     title=indefinite><strong>9.</strong></a>
 
+   <li>indefinite size, <a href="#indefinite-size"
+    title="indefinite size"><strong>9.</strong></a>
+
    <li>inline-flex, <a href="#display-inline-flex"
     title=inline-flex><strong>3.</strong></a>