Skip to content

Commit f2b3f42

Browse files
committed
x
1 parent edf8ead commit f2b3f42

1 file changed

Lines changed: 32 additions & 31 deletions

File tree

css3-multicol/Overview.html

Lines changed: 32 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,13 @@
2929

3030
<h1>CSS Multi-column Layout Module</h1>
3131

32-
<h2 class="no-num no-toc" id=w3c-working>Editor's Draft 9 March 2011</h2>
32+
<h2 class="no-num no-toc" id=w3c-working>Editor's Draft 21 March 2011</h2>
3333

3434
<dl>
3535
<dt>This version:
3636

3737
<dd>
38-
<!--<a href="http://www.w3.org/TR/2011/CR-css3-multicol-20110309">http://www.w3.org/TR/2011/ED-css3-multicol-20110309</a>-->
38+
<!--<a href="http://www.w3.org/TR/2011/CR-css3-multicol-20110321">http://www.w3.org/TR/2011/ED-css3-multicol-20110321</a>-->
3939
<a
4040
href="http://dev.w3.org/csswg/css3-multicol/">http://dev.w3.org/csswg/css3-multicol/</a>
4141

@@ -951,9 +951,8 @@ <h3 id=pseudo-algorithm><span class=secno>3.4. </span>Pseudo-algorithm</h3>
951951
</ul>
952952

953953
<p>The <code>floor()</code> function rounds a number to the next smaller
954-
integer.
955-
956-
<pre>
954+
integer. <!--
955+
<pre>
957956
(01) if ((column-width = auto) and (column-count = auto)) or
958957
(02) ((available-width = unknown) and (column-count = auto)) then
959958
(03) exit; /* no columns */
@@ -989,37 +988,39 @@ <h3 id=pseudo-algorithm><span class=secno>3.4. </span>Pseudo-algorithm</h3>
989988
(41) fi
990989
</pre>
991990
992-
<p><span class=issue>Alternative encoding of pseudo-algorithm: </span>
991+
<p><span class=issue>Alternative encoding of pseudo-algorithm:
992+
-->
993+
993994

994995
<pre>
995996
(01) if ((column-width = auto) and (column-count = auto)) then
996-
exit; /* not a multicol element */
997+
(02) exit; /* not a multicol element */
997998

998-
(02) if ((available-width = unknown) and (column-count = auto)) then
999-
(03) exit; /* no columns */
999+
(03) if ((available-width = unknown) and (column-count = auto)) then
1000+
(04) exit; /* no columns */
10001001

1001-
(06) if (available-width = unknown) and (column-count != auto) and (column-width != auto) then
1002-
(07) N := column-count;
1003-
(08) W := column-width;
1004-
(09) exit;
1002+
(05) if (available-width = unknown) and (column-count != auto) and (column-width != auto) then
1003+
(06) N := column-count;
1004+
(07) W := column-width;
1005+
(08) exit;
10051006

1006-
(12) if (available-width = unknown) then
1007-
(13) available-width := shrink-to-fit;
1007+
(09) if (available-width = unknown) then
1008+
(10) available-width := shrink-to-fit;
10081009

1009-
(16) if (column-width = auto) and (column-count != auto) then
1010-
(18) N := column-count;
1011-
(19) W := max(0, (available-width - ((N - 1) * column-gap)) / N);
1012-
exit;
1010+
(11) if (column-width = auto) and (column-count != auto) then
1011+
(12) N := column-count;
1012+
(13) W := max(0, (available-width - ((N - 1) * column-gap)) / N);
1013+
(14) exit;
10131014

1014-
(27) if (column-width != auto) and (column-count = auto) then
1015-
(32) N := min(1, floor((available-width + column-gap) / (column-width + column-gap)));
1016-
(33) W := ((available-width + column-gap) / N) - column-gap;
1017-
exit;
1015+
(15) if (column-width != auto) and (column-count = auto) then
1016+
(16) N := max(1, floor((available-width + column-gap) / (column-width + column-gap)));
1017+
(17) W := ((available-width + column-gap) / N) - column-gap;
1018+
(18) exit;
10181019

1019-
if (column-width != auto) and (column-count != auto) then
1020-
(39) N := min(column-count, floor((available-width + column-gap) / (column-width + column-gap)))
1021-
(40) W := ((available-width + column-gap) / N) - column-gap;
1022-
exit
1020+
(19) if (column-width != auto) and (column-count != auto) then
1021+
(20) N := min(column-count, floor((available-width + column-gap) / (column-width + column-gap)))
1022+
(21) W := ((available-width + column-gap) / N) - column-gap;
1023+
(22) exit
10231024
</pre>
10241025

10251026
<p>In paged media, user agents may perform this calculation on a per-page
@@ -1033,12 +1034,12 @@ <h3 id=pseudo-algorithm><span class=secno>3.4. </span>Pseudo-algorithm</h3>
10331034
class=property>column-width</code></a>&rsquo; has a value other than
10341035
&lsquo;<code class=css>auto</code>&rsquo;, &lsquo;<a
10351036
href="#column-count"><code class=property>column-count</code></a>&rsquo;
1036-
will be ignored. The only case when both &lsquo;<a
1037+
indicates the maximum number of columns. However, both &lsquo;<a
10371038
href="#column-width"><code class=property>column-width</code></a>&rsquo;
10381039
and &lsquo;<a href="#column-count"><code
1039-
class=property>column-count</code></a>&rsquo; can affect the layout is for
1040-
element where the width of the element has not been determined. This can,
1041-
e.g., be the case for table cells and floats.
1040+
class=property>column-count</code></a>&rsquo; are honored when the width
1041+
of the element has not been determined. This can, e.g., be the case for
1042+
table cells and floats.
10421043

10431044
<h3 id=stacking-context><span class=secno>3.5. </span>Stacking context</h3>
10441045

0 commit comments

Comments
 (0)