- From: H?kon Wium Lie via cvs-syncmail <cvsmail@w3.org>
- Date: Wed, 09 Mar 2011 01:37:08 +0000
- To: public-css-commits@w3.org
Update of /sources/public/csswg/css3-multicol
In directory hutz:/tmp/cvs-serv21365
Modified Files:
Overview.src.html
Log Message:
added alternate pseudo-algorithm
Index: Overview.src.html
===================================================================
RCS file: /sources/public/csswg/css3-multicol/Overview.src.html,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -d -r1.131 -r1.132
--- Overview.src.html 9 Mar 2011 01:29:35 -0000 1.131
+++ Overview.src.html 9 Mar 2011 01:37:06 -0000 1.132
@@ -812,42 +812,34 @@
<pre>
-(01) if ((column-width = auto) and (column-count = auto)) or
-(02) ((available-width = unknown) and (column-count = auto)) then
+(01) if ((column-width = auto) and (column-count = auto)) then
+ exit; /* not a multicol element */
+
+(02) if ((available-width = unknown) and (column-count = auto)) then
(03) exit; /* no columns */
-(04) fi
-(05)
+
(06) if (available-width = unknown) and (column-count != auto) and (column-width != auto) then
(07) N := column-count;
(08) W := column-width;
(09) exit;
-(10) fi
(12) if (available-width = unknown) then
(13) available-width := shrink-to-fit;
-(14) fi
-/* the next block is used when column-count is set, and column-width is auto */
-
-(16) if (column-width = auto) then
+(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;
- fi
-/* the next block is used when column-width is set, and column-count is auto */
-
-(27) if (column-count = auto) then
+(27) if (column-count = auto) and (column-width != 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;
- fi
-
-/* the next block is used if both column-count and column-width are set */
-
-(39) N := min(column-count, floor((available-width + column-gap) / (column-width + column-gap)))
-(40) W := ((available-width + column-gap) / N) - column-gap;
+ if (column-count != auto) and (column-width != 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
</pre>
Received on Wednesday, 9 March 2011 01:37:10 UTC