[css3-page] 6.3.2: switch to css3-sizing terminology, lots of fixes.

--HG--
extra : rebase_source : 6d79e7adb1e9d5693708cc9f7319bceca2d9b43c

Author: SimonSapin

css3-page/Overview.html

@@ -9,12 +9,12 @@
    rel=dcterms.rights>
   <meta content=" CSS Paged Media Module Level 3" name=dcterms.title>
   <meta content=text name=dcterms.type>
-  <meta content=2012-11-04 name=dcterms.issued>
+  <meta content=2012-11-05 name=dcterms.issued>
   <meta content="Melinda Grant" name=dcterms.creator>
   <meta content="Håkon Wium Lie" name=dcterms.creator>
   <meta content="Elika J. Etemad" name=dcterms.creator>
   <meta content=W3C name=dcterms.publisher>
-  <meta content="http://www.w3.org/TR/2012/ED-css3-page-20121104/"
+  <meta content="http://www.w3.org/TR/2012/ED-css3-page-20121105/"
    name=dcterms.identifier>
   <meta content="text/html; charset=utf-8" http-equiv=Content-Type>
   <link href="../default.css" rel=stylesheet type="text/css">
@@ -99,14 +99,14 @@
 
     <h1>CSS Paged Media Module Level 3</h1>
 
-    <h2 class="no-num no-toc" id=w3c-working>Editor's Draft 4 November 2012</h2>
+    <h2 class="no-num no-toc" id=w3c-working>Editor's Draft 5 November 2012</h2>
 
     <dl>
      <dt>This version:
 
      <dd><a
       href="http://dev.w3.org/csswg/css3-page/">http://dev.w3.org/csswg/css3-page/</a></dd>
-     <!-- <dd><a href="http://www.w3.org/TR/2012/ED-css3-page-20121104/">http://www.w3.org/TR/2012/WD-css3-page-20121104</a></dd> -->
+     <!-- <dd><a href="http://www.w3.org/TR/2012/ED-css3-page-20121105/">http://www.w3.org/TR/2012/WD-css3-page-20121105</a></dd> -->
 
      <dt>Latest version:
 
@@ -191,7 +191,7 @@ <h2 class="no-num no-toc" id=status>Status of this Document</h2>
    <p>This document contains the <abbr
     title="Cascading Style Sheets">CSS3</abbr> Paged Media Module W3C Last
     Call <a href="/2005/10/Process-20051014/tr.html#RecsWD">Working Draft</a>
-    of 4 November 2012. The Last Call period ends on <span
+    of 5 November 2012. The Last Call period ends on <span
     class=fudge>TBD</span>.
 
    <p>Relative to the previous Last Call Working Draft, this version has
@@ -1378,49 +1378,49 @@ <h4 id=max-margin-dimension><span class=secno>6.3.1. </span>Margin Box
     defined for use in the subsequent margin box calculations:
 
    <dl>
-    <dt id=MaxBoxWidth>max box width
+    <dt id=MaxBoxWidth><dfn id=max-box-width>max box width</dfn>
 
-    <dd>the sum of the page's left border width, left padding, <a
+    <dd>the sum of the page’s left border width, left padding, <a
      href="#page-box">page area</a> width, right padding, and right border
      width. In other words, it is the distance between the <a
-     href="#page-box">page box</a>‘<code class=css>s left border edge and
-     right border edge. This quantity is used when calculating dimensions of
-     the top and bottom margin boxes.</code>
+     href="#page-box">page box</a>’s left border edge and right border
+     edge. This quantity is used when calculating dimensions of the top and
+     bottom margin boxes.
 
-    <dt id=MaxBoxHeight>max box height
+    <dt id=MaxBoxHeight><dfn id=max-box-height>max box height</dfn>
 
     <dd>the sum of the page’s top border width, top padding, <a
      href="#page-box">page area</a> height, bottom padding, and bottom border
      width. In other words, it is the distance between the <a
-     href="#page-box">page box</a>‘<code class=css>s top border edge and
-     bottom border edge. This quantity is used when calculating dimensions of
-     the left and right margin boxes.</code>
+     href="#page-box">page box</a>’s top border edge and bottom border
+     edge. This quantity is used when calculating dimensions of the left and
+     right margin boxes.
 
-    <dt>outer width
+    <dt><dfn id=outer-width>outer width</dfn>
 
-    <dd>the sum of a margin box’s left and right margins, left and right
+    <dd>the sum of a margin box's left and right margins, left and right
      border widths, left and right padding, and content-box width.
 
-    <dt>outer height
+    <dt><dfn id=outer-height>outer height</dfn>
 
     <dd>the sum of a margin box's top and bottom margins, top and bottom
      border widths, top and bottom padding, and content-box height.
    </dl>
 
    <dl>
-    <dt>preferred outer width
+    <dt><dfn id=outer-min-content>outer min-content</dfn> width
 
-    <dd>the sum of a margin box's left and right margins, left and right
-     border widths, left and right padding, and <a
-     href="http://www.w3.org/TR/CSS21/visudet.html#float-width">preferred
-     width</a>.
+    <dd>Like the <a href="#outer-width"><i>outer width</i></a>, except that
+     <a href="http://www.w3.org/TR/css3-sizing/#min-content">‘<code
+     class=css>min-content</code>’</a> is used when ‘<code
+     class=property>width</code>’ is ‘<code class=css>auto</code>’.
 
-    <dt>preferred minimum outer width
+    <dt><dfn id=outer-max-content>outer max-content</dfn> width
 
-    <dd>the sum of a margin box's left and right margins, left and right
-     border widths, left and right padding, and <a
-     href="http://www.w3.org/TR/CSS21/visudet.html#float-width">preferred
-     minimum width</a>.
+    <dd>Like the <a href="#outer-width"><i>outer width</i></a>, except that
+     <a href="http://www.w3.org/TR/css3-sizing/#max-content">‘<code
+     class=css>max-content</code>’</a> is used when ‘<code
+     class=property>width</code>’ is ‘<code class=css>auto</code>’.
    </dl>
 
    <p>The <dfn id=containing-block>containing block</dfn> for a corner margin
@@ -1466,132 +1466,133 @@ <h4 id=margin-dimension><span class=secno>6.3.2. </span>Margin Box
     are replaced by empty boxes with all properties set to their initial
     values. In particular, margins, border widths and padding are all zero.
 
-   <p class=note> Note: The high-level goals are, in order of priority, to
+   <p class=note> Note: The high-level goals are (in order of priority) to
     center the middle box (B) if it is generated, to minimize overflow and
     overlap, and to distribute space proportionally to the amount of content.
 
    <ul>
     <li>If B is not <a href="#generated"><em>generated</em></a>:
      <ul>
       <li>If both A’s and C’s widths are ‘<code
-       class=property>auto</code>’
+       class=css>auto</code>’
        <ul>
-        <li>If the sum of their preferred outer widths is less than or equal
-         to the width of the containing block, their used width are their
-         respective preferred widths.
+        <li>If the sum of their <a href="#outer-max-content"><em>outer
+         max-content</em></a> is less than or equal to <a
+         href="#max-box-width"><var>max box width</var></a>, the used width
+         for A and C is the respective ‘<code
+         class=css>max-content</code>’.
 
         <li>Otherwise,
          <ul>
-          <li>The remaining width is the containing block’s with minus
-           A’s and C’s outer preferred minimum widths.
-
-          <li>If the remaining width is negative or zero, the used widths for
-           A and C are their respective preferred minimum widths.
-
-          <li>Otherwise,
-           <ul>
-            <li>The respective weights for A and C are the preferred width
-             minus the preferred minimum width
-
-            <li>The respective used widths for A and C are: <em>preferred
-             minimum width + (remaining width × weight ÷ sum of both
-             weights)</em>
-           </ul>
-           (In other words, the preferred minimum widths are increased by
-           distributing the remaining width proportionally to the weights.)
-           Note: weights by definition can not be negative, and this rule
-           only applies when at least one of them is greater than zero: this
-           rule never needs to divide by zero.
+          <li>Let <var>remaining width</var> be <a
+           href="#max-box-width"><var>max box width</var></a> minus A’s and
+           C’s <a href="#outer-min-content"><var>outer
+           min-content</var></a>
+
+          <li>If <var>remaining width</var> is negative or zero, the used
+           widths for A and C are the respective ‘<code
+           class=css>min-content</code>’.
+
+          <li>Otherwise, the respective used widths for A and C are:
+           <code>min-content + (<var>remaining width</var> × weight ÷ sum
+           of both weights)</code>, where the respective weights are ‘<code
+           class=css>max-content</code>’ minus ‘<code
+           class=css>min-content</code>’.
          </ul>
+
+         <p class=note>Note: Each box gets at least ‘<code
+          class=css>min-content</code>’. The remaining space, if any, is
+          distributed proportionally to ‘<code
+          class=css>max-content</code>’ minus ‘<code
+          class=css>min-content</code>’. The rules are construted to never
+          divide by zero.
        </ul>
-     </ul>
 
-     <ul>
-      <li>Otherwise, if A’s width is ‘<code
-       class=property>auto</code>’, its used width is the "shrink-to-fit"
-       width with the available width set to:
+      <li>Otherwise, if A’s width is ‘<code class=css>auto</code>’, the
+       used width is <code>min(max-content, max(min-content,
+       available))</code> where <var>available</var> is:
        <ul>
-        <li>the containing block’s width
+        <li><a href="#max-box-width"><var>max box width</var></a>
 
-        <li>minus the C’s outer width
+        <li>minus C’s <a href="#outer-width"><i>outer width</i></a>
 
-        <li>minus the A’s own margins, borders and padding
+        <li>minus A’s own margins, borders and padding
        </ul>
 
-      <li>Otherwise, if C’s width is ‘<code
-       class=property>auto</code>’, its used width is the "shrink-to-fit"
-       width with the available width set to:
+      <li>Otherwise, if C’s width is ‘<code class=css>auto</code>’, the
+       used width is <code>min(max-content, max(min-content,
+       available))</code> where <var>available</var> is:
        <ul>
-        <li>the containing block’s width
+        <li><a href="#max-box-width"><var>max box width</var></a>
 
-        <li>minus the A’s outer width
+        <li>minus A’s <a href="#outer-width"><i>outer width</i></a>
 
-        <li>minus the C’s own margins, borders and padding
+        <li>minus C’s own margins, borders and padding
        </ul>
      </ul>
 
     <li>Otherwise (if B is generated)
      <ul>
-      <li>If B’s width is ‘<code class=property>auto</code>’
+      <li>If B’s width is ‘<code class=css>auto</code>’
        <ul>
-        <li>Define AC-minimum as twice the greater of A’s and C’s
-         preferred minimum outer width, and AC-preferred as twice the greater
-         of their preferred outer width.
+        <li>Let <var>AC-min</var> be <code>2 × max(A’s outer min-content,
+         C’s outer min-content)</code>.
+
+        <li>Let <var>AC-max</var> be <code>2 × max(A’s outer max-content,
+         C’s outer max-content)</code>.
 
-        <li>If B’s preferred minimum outer width plus AC-minimum is greater
-         than the width of the containing block, the used width for B is its
-         preferred minimum width.
+        <li>If B’s <a href="#outer-max-content"><i>outer
+         max-content</i></a> is less than or equal to <a
+         href="#max-box-width"><i>max box width</i></a> minus
+         <var>AC-max</var>, the used width for B is ‘<code
+         class=css>max-content</code>’.
+
+        <li>Otherwise, if B’s <a href="#outer-min-content"><i>outer
+         min-content</i></a> is greater than <a href="#max-box-width"><i>max
+         box width</i></a> minus <var>AC-min</var>, the used width for B is
+         ‘<code class=css>min-content</code>’.
 
         <li>Otherwise,
          <ul>
-          <li>The remaining width is the containing block’s with minus
-           AC-minimum minus B’s outer preferred minimum width.
-
-          <li>If the remaining width is negative or zero, the used widths for
-           B is the preferred minimum width.
-
-          <li>Otherwise,
-           <ul>
-            <li>The weight for B is its preferred width minus its preferred
-             minimum width. The weight for AC is AC-preferred minus
-             AC-minimum.
-
-            <li>The used width for B is: <em>preferred minimum width +
-             (remaining width × weight ÷ sum of both weights)</em>
-           </ul>
-           (In other words, the preferred minimum width is increased by a
-           portion of the remaining width proportional to the relative
-           weight.) Note: weights by definition can not be negative, and this
-           rule only applies when at least one of them is greater than zero:
-           this rule never needs to divide by zero.
+          <li>Let the weight for B be ‘<code
+           class=css>max-content</code>’ minus ‘<code
+           class=css>min-content</code>’.
+
+          <li>Let the weight for AC be <var>AC-max</var> minus
+           <var>AC-min</var>
+
+          <li>The used width for B is: <code>min-content + (remaining ×
+           weight ÷ sum of both weights)</code>, where <var>remaining</var>
+           is <a href="#max-box-width"><i>max box width</i></a> minus
+           <var>AC-min</var> minus B’s <a
+           href="#outer-min-content"><i>outer min-content</i></a>.
          </ul>
        </ul>
 
-      <li>If A’s width is ‘<code class=property>auto</code>’, the used
-       width is the "shrink-to-fit" width with the available width set to:
+      <li>Then, if A’s width is ‘<code class=css>auto</code>’, the used
+       width is <code>min(max-content, max(min-content, available))</code>
+       where <var>available</var> is:
        <ul>
-        <li>half of the containing block’s width
+        <li>half of <a href="#max-box-width"><var>max box width</var></a>
 
-        <li>minus half of the outer width of B.
+        <li>minus half of B’s <a href="#outer-width"><i>outer width</i></a>
 
         <li>minus the A’s own margins, borders and padding
        </ul>
 
-      <li>If C’s width is ‘<code class=property>auto</code>’, the used
-       width is the "shrink-to-fit" width with the available width set to:
+      <li>Then, if C’s width is ‘<code class=css>auto</code>’, the used
+       width is <code>min(max-content, max(min-content, available))</code>
+       where <var>available</var> is:
        <ul>
-        <li>half of the containing block’s width
+        <li>half of <a href="#max-box-width"><var>max box width</var></a>
 
-        <li>minus half of the outer width of B.
+        <li>minus half of B’s <a href="#outer-width"><i>outer width</i></a>
 
         <li>minus the C’s own margins, borders and padding
        </ul>
      </ul>
    </ul>
 
-   <p class=note> Note: By their definitions, margins can be negative, but
-    widths cannot.
-
    <p>The used values for ‘<code class=property>bottom-left</code>’,
     ‘<code class=property>bottom-center</code>’ and ‘<code
     class=property>bottom-right</code>’ margin boxes are established by the