csswg/css3-multicol Overview.html,1.133,1.134

Update of /sources/public/csswg/css3-multicol
In directory hutz:/tmp/cvs-serv7557

Modified Files:
	Overview.html 
Log Message:
x

Index: Overview.html
===================================================================
RCS file: /sources/public/csswg/css3-multicol/Overview.html,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -d -r1.133 -r1.134
--- Overview.html	9 Mar 2011 01:41:44 -0000	1.133
+++ Overview.html	21 Mar 2011 14:26:12 -0000	1.134
@@ -29,13 +29,13 @@
 
    <h1>CSS Multi-column Layout Module</h1>
 
-   <h2 class="no-num no-toc" id=w3c-working>Editor's Draft 9 March 2011</h2>
+   <h2 class="no-num no-toc" id=w3c-working>Editor's Draft 21 March 2011</h2>
 
    <dl>
     <dt>This version:
 
     <dd>
-     <!--<a href="http://www.w3.org/TR/2011/CR-css3-multicol-20110309">http://www.w3.org/TR/2011/ED-css3-multicol-20110309</a>-->
+     <!--<a href="http://www.w3.org/TR/2011/CR-css3-multicol-20110321">http://www.w3.org/TR/2011/ED-css3-multicol-20110321</a>-->
      <a
      href="http://dev.w3.org/csswg/css3-multicol/">http://dev.w3.org/csswg/css3-multicol/</a>
      
@@ -951,9 +951,8 @@
   </ul>
 
   <p>The <code>floor()</code> function rounds a number to the next smaller
-   integer.
-
-  <pre>
+   integer. <!--
+<pre>
 (01)  if ((column-width = auto) and (column-count = auto)) or
 (02)     ((available-width = unknown) and (column-count = auto)) then
 (03)    exit; /* no columns */
@@ -989,37 +988,39 @@
 (41)  fi
 </pre>
 
-  <p><span class=issue>Alternative encoding of pseudo-algorithm: </span>
+<p><span class=issue>Alternative encoding of pseudo-algorithm:
+-->
+   
 
   <pre>
 (01)  if ((column-width = auto) and (column-count = auto)) then
-        exit; /* not a multicol element */
+(02)        exit; /* not a multicol element */
 
-(02)  if ((available-width = unknown) and (column-count = auto)) then
-(03)    exit; /* no columns */
+(03)  if ((available-width = unknown) and (column-count = auto)) then
+(04)    exit; /* no columns */
 
-(06)  if (available-width = unknown) and (column-count != auto) and (column-width != auto) then
-(07)    N := column-count;  
-(08)    W := column-width;
-(09)    exit;
+(05)  if (available-width = unknown) and (column-count != auto) and (column-width != auto) then
+(06)    N := column-count;  
+(07)    W := column-width;
+(08)  exit;
 
-(12)  if (available-width = unknown) then
-(13)    available-width := shrink-to-fit;
+(09)  if (available-width = unknown) then
+(10)    available-width := shrink-to-fit;
 
-(16)  if (column-width = auto) and (column-count != auto) then
-(18)    N := column-count;
-(19)    W := max(0, (available-width - ((N - 1) * column-gap)) / N);
-        exit;
+(11)  if (column-width = auto) and (column-count != auto) then
+(12)    N := column-count;
+(13)    W := max(0, (available-width - ((N - 1) * column-gap)) / N);
+(14)  exit;
 
-(27)  if (column-width != auto) and (column-count = auto) then
-(32)    N := min(1, floor((available-width + column-gap) / (column-width + column-gap)));
-(33)    W := ((available-width + column-gap) / N) - column-gap;
-        exit;
+(15)  if (column-width != auto) and (column-count = auto) then
+(16)    N := max(1, floor((available-width + column-gap) / (column-width + column-gap)));
+(17)    W := ((available-width + column-gap) / N) - column-gap;
+(18)  exit;
 
-      if (column-width != auto) and (column-count != auto) then
-(39)    N := min(column-count, floor((available-width + column-gap) / (column-width + column-gap)))
-(40)    W := ((available-width + column-gap) / N) - column-gap;
-        exit
+(19)  if (column-width != auto) and (column-count != auto) then
+(20)    N := min(column-count, floor((available-width + column-gap) / (column-width + column-gap)))
+(21)    W := ((available-width + column-gap) / N) - column-gap;
+(22)  exit
 </pre>
 
   <p>In paged media, user agents may perform this calculation on a per-page
@@ -1033,12 +1034,12 @@
    class=property>column-width</code></a>&rsquo; has a value other than
    &lsquo;<code class=css>auto</code>&rsquo;, &lsquo;<a
    href="#column-count"><code class=property>column-count</code></a>&rsquo;
-   will be ignored. The only case when both &lsquo;<a
+   indicates the maximum number of columns. However, both &lsquo;<a
    href="#column-width"><code class=property>column-width</code></a>&rsquo;
    and &lsquo;<a href="#column-count"><code
-   class=property>column-count</code></a>&rsquo; can affect the layout is for
-   element where the width of the element has not been determined. This can,
-   e.g., be the case for table cells and floats.
+   class=property>column-count</code></a>&rsquo; are honored when the width
+   of the element has not been determined. This can, e.g., be the case for
+   table cells and floats.
 
   <h3 id=stacking-context><span class=secno>3.5. </span>Stacking context</h3>

Received on Monday, 21 March 2011 14:26:16 UTC