x

Author: howcom

css3-multicol/Overview.html

@@ -970,16 +970,8 @@ <h3 id=pseudo-algorithm><span class=secno>3.4. </span>Pseudo-algorithm</h3>
 (14)  fi
 (15)  
 (16)  if (column-width = auto) then
-(17)    if ((column-count - 1) * column-gap &lt; available-width) then
-(18)      N := column-count;
-(19)      W := (available-width - ((N - 1) * column-gap))/N;
-(20)    elsif (column-gap >= available-width) then
-(21)      N := 1;
-(22)      W := available-width;
-(23)    else
-(24)      N := floor(available-width/column-gap);
-(25)      W := (available-width - ((N - 1) * column-gap))/N;
-(26)    fi
+(18)    N := column-count;
+(19)    W := max(0, (available-width - ((N - 1) * column-gap))/N);
 (27)  elsif (column-count = auto) then
 (28)    if (column-width >= available-width) then
 (29)      N := 1
@@ -992,7 +984,7 @@ <h3 id=pseudo-algorithm><span class=secno>3.4. </span>Pseudo-algorithm</h3>
 (36)    N := 1
 (37)    W := available-width;
 (38)  else
-(39)    N := floor((available-width + column-gap) / (column-width + column-gap));
+(39)    N := min(column-count, floor((available-width + column-gap) / (column-width + column-gap)))
 (40)    W := ((available-width + column-gap) / N) - column-gap;
 (41)  fi
 </pre>