Skip to content

Commit e73a06c

Browse files
committed
machine-generated
1 parent c1e35fe commit e73a06c

1 file changed

Lines changed: 15 additions & 19 deletions

File tree

css3-multicol/Overview.html

Lines changed: 15 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,9 @@ <h2 class="no-num no-toc" id=status-of-this-document>Status of this
130130
between the text and the pseudo-algorithm in section&nbsp;3.4. The
131131
pseudo-algorithm was corrected and also made easier to read. The wording
132132
of a few other sections was improved in places, without changes to the
133-
functionality.
133+
functionality. In January, 2012, some examples and the description of the
134+
&lsquo;<a href="#column-fill"><code
135+
class=property>column-fill</code></a>&rsquo; property was revised.
134136

135137
<p>This document will remain Candidate Recommendation at least until 12 May
136138
2011. See the <a href="#cr-exit-criteria">CR exit criteria.</a>
@@ -505,17 +507,13 @@ <h2 id=the-multi-column-model><span class=secno>2. </span>The multi-column
505507
the textual content of the different examples vary slightly.
506508
</div>
507509

508-
<p>Column boxes act as the containing block for their content. That is,
509-
column boxes behave like block-level, table cell, and inline-block boxes
510-
as per CSS 2.1, section 10.1, item 2 <a href="#CSS21"
510+
<p>Column boxes are block container boxes. That is, column boxes behave
511+
like block-level, table cell, and inline-block boxes as per CSS 2.1,
512+
section 10.1, item 2 <a href="#CSS21"
511513
rel=biblioentry>[CSS21]<!--{{!CSS21}}--></a>. However, column boxes do not
512-
establish containing blocks for elements with &lsquo;<code
514+
establish block container boxes for elements with &lsquo;<code
513515
class=css>position: fixed</code>&rsquo; or &lsquo;<code
514516
class=css>position: absolute</code>&rsquo;.
515-
<!--Percentage values that are calculated
516-
relative to the containing block height are calculated based on the
517-
multicol element's height, not the column box's height.-->
518-
519517

520518
<div class=example>
521519
<p>In this example, the width of the image is set with these rules:
@@ -1051,7 +1049,7 @@ <h3 id=stacking-context><span class=secno>3.5. </span>Stacking context</h3>
10511049

10521050
<p>All column boxes in a multi-column element are in the same stacking
10531051
context and the drawing order of their contents is as specified in CSS
1054-
2.1.
1052+
2.1. Column boxes do not establish new stacking contexts.
10551053

10561054
<h2 id=column-gaps-and-rules><span class=secno>4. </span>Column gaps and
10571055
rules</h2>
@@ -1385,8 +1383,8 @@ <h2 id=column-breaks><span class=secno>5. </span>Column breaks</h2>
13851383
<p>When content is laid out in multiple columns, the user agent must
13861384
determine where column breaks are placed. The problem of breaking content
13871385
into columns is similar to breaking content into pages, which is described
1388-
in <a href="#CSS21" rel=biblioentry>[CSS21]<!--{{!CSS21}}--></a>.
1389-
<!--add specific reference to 13.3.3 -->
1386+
in CSS 2.1, section 13.3.3 <a href="#CSS21"
1387+
rel=biblioentry>[CSS21]<!--{{!CSS21}}--></a>.
13901388

13911389
<p>Three new properties are introduced to allow column breaks to be
13921390
described in the same properties as page breaks: &lsquo;<a
@@ -2230,7 +2228,7 @@ <h3 id=pagination-and-overflow-outside-multicol><span class=secno>8.2.
22302228
}
22312229
</pre>
22322230

2233-
<p>As a result, the number of columns increases and the extra columns
2231+
<p>As a result, the number of columns increases and the extra columns are
22342232
added in the inline direction:
22352233

22362234
<div class=cols style="height: 100px">
@@ -2254,9 +2252,7 @@ <h3 id=pagination-and-overflow-outside-multicol><span class=secno>8.2.
22542252
<div class=col style="left: 525px">
22552253
<p> Pqr stu vw xyz. A bc<br>
22562254
def g hij klm nopqrs<br>
2257-
tuv wxy z. Abc de fg<br>
2258-
hi jklmno pqr stu v<br>
2259-
wx yz.
2255+
tuv wxy z.
22602256
</div>
22612257

22622258
<div class=gap style="left: 150px"></div>
@@ -2404,9 +2400,9 @@ <h2 class=no-num id=acknowledgments>Acknowledgments</h2>
24042400
Bj&ouml;rn H&ouml;hrmann, Joost de Valk, Peter-Paul Koch, Shelby Moore,
24052401
Till Halbach, C&eacute;dric Savarese, Andy Clarke, Robert O'Callahan,
24062402
Markus Mielke, Alex Mogilevsky, Sergey Genkin, Michael Day, Melinda Grant,
2407-
Kevin Lawver, David Baron, Bert Bos, Dave Raggett, Chris Wilson, Robert
2408-
Stevahn, Peter Linss, Chris Lilley, Steve Zilles, Tantek &Ccedil;elik,
2409-
Daniel Glazman and Ian Hickson.
2403+
Kevin Lawver, Anton Prowse, L. David Baron, Bert Bos, Dave Raggett, Chris
2404+
Wilson, Robert Stevahn, Peter Linss, Chris Lilley, Steve Zilles, Tantek
2405+
&Ccedil;elik, Daniel Glazman and Ian Hickson.
24102406

24112407
<h2 class=no-num id=references>References</h2>
24122408

0 commit comments

Comments
 (0)