csswg/css3-writing-modes Overview.html,1.124,1.125 Overview.src.html,1.130,1.131

Update of /sources/public/csswg/css3-writing-modes
In directory hutz:/tmp/cvs-serv27038

Modified Files:
	Overview.html Overview.src.html 
Log Message:
Fix error in auto-sizing

Index: Overview.html
===================================================================
RCS file: /sources/public/csswg/css3-writing-modes/Overview.html,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -d -r1.124 -r1.125
--- Overview.html	20 May 2011 06:58:41 -0000	1.124
+++ Overview.html	20 May 2011 07:14:15 -0000	1.125
@@ -2393,32 +2393,31 @@
   <ol>
    <li>If &lsquo;<code class=property>column-count</code>&rsquo; and
     &lsquo;<code class=property>column-width</code>&rsquo; are both &lsquo;<a
-    href="#auto"><code class=css>auto</code></a>&rsquo;, then the
-    &lsquo;<code class=property>column-count</code>&rsquo; is assumed to be
-    &lsquo;<code class=css>1</code>&rsquo;, and the following rules apply.
-
-   <li>If the &lsquo;<code class=property>column-width</code>&rsquo; is
-    &lsquo;<a href="#auto"><code class=css>auto</code></a>&rsquo;, the column
-    width is calculated as if the element's containing block were the initial
-    containing block.
+    href="#auto"><code class=css>auto</code></a>&rsquo;, a used &lsquo;<code
+    class=property>column-width</code>&rsquo; is calculated for the element
+    as the <a href="#fill-available-measure"><i>fill-available
+    measure</i></a> using the <a href="#fallback-measure"><i>fallback
+    measure</i></a> as the <a href="#available-measure"><i>available
+    measure</i></a>.
 
-   <li>If the column's extent is not fixed, the <a
-    href="#fill-available"><i>fill-available</i></a> extent of the element is
-    used.
+   <li>If the columns' extent is not fixed, the <a
+    href="#fill-available-extent"><i>fill-available extent</i></a> of the
+    element is used.
 
    <li>The used column-count then follows from filling the resulting columns
     with the element's content.
   </ol>
 
-  <p>The used measure of the element is then the <a
-   href="#max-content"><i>max-content</i></a> measure of the resulting
-   multi-column element: if the content neither wraps nor paginates within
-   the multi-column element, then this will be the intrinsic measure of the
-   content; else it will be calculated from the used column width, column
-   count, and column gap.
+  <p>The used measure of the resulting multi-column element is then
+   calculated: if the content neither wraps nor paginates within the
+   multi-column element, then the used measure is the <a
+   href="#max-content-measure"><i>max-content measure</i></a> of the
+   element's contents; else it is calculated from the used column width,
+   column count, and column gap.
 
   <p>The used extent of the element is either the used column extent (if
-   multiple columns were used) or the intrinsic extent of the content.
+   multiple columns were used) or the <a
+   href="#max-content-extent"><i>max-content extent</i></a> of the content.
 
   <p class=note>This should behave the same as the auto-sizing algorithm
    defined in the previous section, except overflowing content, instead of

Index: Overview.src.html
===================================================================
RCS file: /sources/public/csswg/css3-writing-modes/Overview.src.html,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -d -r1.130 -r1.131
--- Overview.src.html	20 May 2011 06:58:41 -0000	1.130
+++ Overview.src.html	20 May 2011 07:14:16 -0000	1.131
@@ -1757,26 +1757,26 @@
     measure is ''auto'':
 
   <ol>
-    <li>If 'column-count' and 'column-width' are both ''auto'', then
-      the 'column-count' is assumed to be ''1'', and the following rules
-      apply.
-    <li>If the 'column-width' is ''auto'', the column width is
-      calculated as if the element's containing block were the initial
-      containing block.
-    <li>If the column's extent is not fixed, the <i>fill-available</i>
-      extent of the element is used.
+    <li>If 'column-count' and 'column-width' are both ''auto'', a
+      used 'column-width' is calculated for the element as the
+      <i>fill-available measure</i> using the <i>fallback measure</i>
+      as the <i>available measure</i>.
+    <li>If the columns' extent is not fixed, the <i>fill-available
+      extent</i> of the element is used.
     <li>The used column-count then follows from filling the resulting
       columns with the element's content.
   </ol>
-  
-  <p>The used measure of the element is then the <i>max-content</i> measure
-    of the resulting multi-column element:
+
+  <p>The used measure of the resulting multi-column element is then
+    calculated:
     if the content neither wraps nor paginates within the multi-column
-    element, then this will be the intrinsic measure of the content;
-    else it will be calculated from the used column width, column count,
+    element, then the used measure is the <i>max-content measure</i>
+    of the element's contents;
+    else it is calculated from the used column width, column count,
     and column gap.
   <p>The used extent of the element is either the used column extent
-    (if multiple columns were used) or the intrinsic extent of the content.
+    (if multiple columns were used) or the <i>max-content extent</i>
+    of the content.
 
   <p class="note">This should behave the same as the auto-sizing algorithm
     defined in the previous section, except overflowing content, instead of

Received on Friday, 20 May 2011 07:14:19 UTC