@@ -184,49 +184,55 @@ <h2 class="no-num no-toc" id=contents>Table of contents</h2>
184184
185185 < ul class =toc >
186186 < li > < a href ="#intro "> < span class =secno > 1. </ span > Introduction</ a >
187+ < ul class =toc >
188+ < li > < a href ="#module-interactions "> < span class =secno > 1.1. </ span > Module
189+ Interactions</ a >
190+
191+ < li > < a href ="#values "> < span class =secno > 1.2. </ span > Values</ a >
187192
188- < li > < a href ="#definitions "> < span class =secno > 2. </ span > Definitions</ a >
193+ < li > < a href ="#definitions "> < span class =secno > 1.3. </ span > Definitions</ a >
194+ </ ul >
189195
190- < li > < a href ="#shapes "> < span class =secno > 3 . </ span > Shapes</ a >
196+ < li > < a href ="#shapes "> < span class =secno > 2 . </ span > Shapes</ a >
191197 < ul class =toc >
192198 < li > < a href ="#relation-to-box-model-and-float-behavior "> < span
193- class =secno > 3 .1. </ span > Relation to the box model and float
199+ class =secno > 2 .1. </ span > Relation to the box model and float
194200 behavior</ a >
195201
196- < li > < a href ="#basic-shapes-from-svg-syntax "> < span class =secno > 3 .2.
202+ < li > < a href ="#basic-shapes-from-svg-syntax "> < span class =secno > 2 .2.
197203 </ span > Basic Shapes</ a >
198204 < ul class =toc >
199- < li > < a href ="#supported-basic-shapes "> < span class =secno > 3 .2.1.
205+ < li > < a href ="#supported-basic-shapes "> < span class =secno > 2 .2.1.
200206 </ span > Supported Shapes</ a >
201207
202- < li > < a href ="#basic-shape-syntax "> < span class =secno > 3 .2.2.
208+ < li > < a href ="#basic-shape-syntax "> < span class =secno > 2 .2.2.
203209 </ span > Syntax of Basic Shapes</ a >
204210
205- < li > < a href ="#basic-shape-interpolation "> < span class =secno > 3 .2.3.
211+ < li > < a href ="#basic-shape-interpolation "> < span class =secno > 2 .2.3.
206212 </ span > Interpolation of Basic Shapes</ a >
207213 </ ul >
208214
209- < li > < a href ="#shapes-from-image "> < span class =secno > 3 .3. </ span > Shapes
215+ < li > < a href ="#shapes-from-image "> < span class =secno > 2 .3. </ span > Shapes
210216 from Image</ a >
211217
212- < li > < a href ="#declaring-shapes "> < span class =secno > 3 .4. </ span > Declaring
218+ < li > < a href ="#declaring-shapes "> < span class =secno > 2 .4. </ span > Declaring
213219 Shapes</ a >
214220 < ul class =toc >
215- < li > < a href ="#shape-outside-property "> < span class =secno > 3 .4.1.
221+ < li > < a href ="#shape-outside-property "> < span class =secno > 2 .4.1.
216222 </ span > The ‘< code class =property > shape-outside</ code > ’
217223 Property</ a >
218224
219- < li > < a href ="#shape-image-threshold-property "> < span class =secno > 3 .4.2.
225+ < li > < a href ="#shape-image-threshold-property "> < span class =secno > 2 .4.2.
220226 </ span > The ‘< code class =property > shape-image-threshold</ code > ’
221227 Property</ a >
222228
223- < li > < a href ="#shape-margin-property "> < span class =secno > 3 .4.3.
229+ < li > < a href ="#shape-margin-property "> < span class =secno > 2 .4.3.
224230 </ span > The ‘< code class =property > shape-margin</ code > ’
225231 property</ a >
226232 </ ul >
227233 </ ul >
228234
229- < li > < a href ="#conformance "> < span class =secno > 4 . </ span > Conformance</ a >
235+ < li > < a href ="#conformance "> < span class =secno > 3 . </ span > Conformance</ a >
230236
231237 < li class =no-num > < a href ="#acknowledgments "> Acknowledgments</ a >
232238
@@ -262,7 +268,25 @@ <h2 id=intro><span class=secno>1. </span>Introduction</h2>
262268 < p > This specification defines properties to control the geometry of an
263269 element's < a href ="#float-area "> float area</ a > .
264270
265- < h2 id =definitions > < span class =secno > 2. </ span > Definitions</ h2 >
271+ < h3 id =module-interactions > < span class =secno > 1.1. </ span > Module
272+ Interactions</ h3 >
273+
274+ < p > This module extends the float features defined in < a href ="#CSS21 "
275+ rel =biblioentry > [CSS21]<!--{{!CSS21}}--> </ a > chapter 9.
276+
277+ < h3 id =values > < span class =secno > 1.2. </ span > Values</ h3 >
278+
279+ < p > This specification follows the CSS property definition conventions from
280+ < a href ="#CSS21 " rel =biblioentry > [CSS21]<!--{{!CSS21}}--> </ a > . Value types
281+ not defined in these specifications are defined in CSS Values and Units
282+ Module Level 3 [[!CSS3VAL].
283+
284+ < p > In addition to the property-specific values listed in their definitions,
285+ all properties defined in this specification also accept the inherit
286+ keyword as their property value. For readability it has not been repeated
287+ explicitly.
288+
289+ < h3 id =definitions > < span class =secno > 1.3. </ span > Definitions</ h3 >
266290
267291 < p > < dfn id =wrap > Wrap</ dfn >
268292
@@ -283,7 +307,7 @@ <h2 id=definitions><span class=secno>2. </span>Definitions</h2>
283307 class =property > shape-outside</ code > </ a > ’ property can be used to define
284308 arbitrary, non-rectangular float areas.
285309
286- < h2 id =shapes > < span class =secno > 3 . </ span > Shapes</ h2 >
310+ < h2 id =shapes > < span class =secno > 2 . </ span > Shapes</ h2 >
287311
288312 < p > Shapes define arbitrary geometric contours around which inline content
289313 flows. The shape-outside property defines the < a href ="#float-area "> float
@@ -296,7 +320,7 @@ <h2 id=shapes><span class=secno>3. </span>Shapes</h2>
296320 < p class =note > A future level of CSS Shapes will define a shape-inside
297321 property, which will define a shape to wrap content within the element.
298322
299- < h3 id =relation-to-box-model-and-float-behavior > < span class =secno > 3 .1.
323+ < h3 id =relation-to-box-model-and-float-behavior > < span class =secno > 2 .1.
300324 </ span > Relation to the box model and float behavior</ h3 >
301325
302326 < p > While the boundaries used for wrapping inline flow content outside a
@@ -411,7 +435,7 @@ <h3 id=relation-to-box-model-and-float-behavior><span class=secno>3.1.
411435 < img alt ="Stacking two floats with a small shape-outside "
412436 class =singleImgExample src ="images/stacked-float-example.png "> </ div >
413437
414- < h3 id =basic-shapes-from-svg-syntax > < span class =secno > 3 .2. </ span > Basic
438+ < h3 id =basic-shapes-from-svg-syntax > < span class =secno > 2 .2. </ span > Basic
415439 Shapes</ h3 >
416440
417441 < p > Shapes can be specified using syntax similar to SVG's < a
@@ -435,7 +459,7 @@ <h3 id=basic-shapes-from-svg-syntax><span class=secno>3.2. </span>Basic
435459 recommendation < a href ="#SVG11 "
436460 rel =biblioentry > [SVG11]<!--{{!SVG11}}--> </ a > .
437461
438- < h4 id =supported-basic-shapes > < span class =secno > 3 .2.1. </ span > Supported
462+ < h4 id =supported-basic-shapes > < span class =secno > 2 .2.1. </ span > Supported
439463 Shapes</ h4 >
440464
441465 < p > The following basic shapes are supported. All basic shapes use
@@ -541,7 +565,7 @@ <h4 id=supported-basic-shapes><span class=secno>3.2.1. </span>Supported
541565
542566 < p >
543567
544- < h4 id =basic-shape-syntax > < span class =secno > 3 .2.2. </ span > Syntax of Basic
568+ < h4 id =basic-shape-syntax > < span class =secno > 2 .2.2. </ span > Syntax of Basic
545569 Shapes</ h4 >
546570
547571 < pre >
@@ -562,7 +586,7 @@ <h4 id=basic-shape-syntax><span class=secno>3.2.2. </span>Syntax of Basic
562586<fill-rule> = nonzero | evenodd
563587</ pre >
564588
565- < h4 id =basic-shape-interpolation > < span class =secno > 3 .2.3.
589+ < h4 id =basic-shape-interpolation > < span class =secno > 2 .2.3.
566590 </ span > Interpolation of Basic Shapes</ h4 >
567591
568592 < p > For interpolating between one basic shape and a second, the rules
@@ -607,7 +631,7 @@ <h4 id=basic-shape-interpolation><span class=secno>3.2.3.
607631 </ ul >
608632 </ ul >
609633
610- < h3 id =shapes-from-image > < span class =secno > 3 .3. </ span > Shapes from Image</ h3 >
634+ < h3 id =shapes-from-image > < span class =secno > 2 .3. </ span > Shapes from Image</ h3 >
611635
612636 < p > Another way of defining shapes is by specifying a source image whose
613637 alpha channel is used to compute the shape. The shape is computed to be
@@ -683,7 +707,7 @@ <h3 id=shapes-from-image><span class=secno>3.3. </span>Shapes from Image</h3>
683707 </ div >
684708 <!-- End section "Shapes from image" -->
685709
686- < h3 id =declaring-shapes > < span class =secno > 3 .4. </ span > Declaring Shapes</ h3 >
710+ < h3 id =declaring-shapes > < span class =secno > 2 .4. </ span > Declaring Shapes</ h3 >
687711
688712 < p > Shapes are declared with the ‘< a href ="#shape-outside "> < code
689713 class =property > shape-outside</ code > </ a > ’ property, with possible
@@ -695,7 +719,7 @@ <h3 id=declaring-shapes><span class=secno>3.4. </span>Declaring Shapes</h3>
695719 properties changes the geometry of a float element's < a
696720 href ="#float-area "> float area</ a > .
697721
698- < h4 id =shape-outside-property > < span class =secno > 3 .4.1. </ span > The ‘< a
722+ < h4 id =shape-outside-property > < span class =secno > 2 .4.1. </ span > The ‘< a
699723 href ="#shape-outside "> < code class =property > shape-outside</ code > </ a > ’
700724 Property</ h4 >
701725
@@ -786,7 +810,7 @@ <h4 id=shape-outside-property><span class=secno>3.4.1. </span>The ‘<a
786810 </ dl >
787811 <!-- End section "The shape-outside Property" -->
788812
789- < h4 id =shape-image-threshold-property > < span class =secno > 3 .4.2. </ span > The
813+ < h4 id =shape-image-threshold-property > < span class =secno > 2 .4.2. </ span > The
790814 ‘< a href ="#shape-image-threshold "> < code
791815 class =property > shape-image-threshold</ code > </ a > ’ Property</ h4 >
792816
@@ -863,7 +887,7 @@ <h4 id=shape-image-threshold-property><span class=secno>3.4.2. </span>The
863887 <!-- End section "The shape-image-threshold property" -->
864888 <!-- End section "Declaring Shapes" -->
865889
866- < h4 id =shape-margin-property > < span class =secno > 3 .4.3. </ span > The ‘< a
890+ < h4 id =shape-margin-property > < span class =secno > 2 .4.3. </ span > The ‘< a
867891 href ="#shape-margin "> < code class =property > shape-margin</ code > </ a > ’
868892 property</ h4 >
869893
@@ -955,7 +979,7 @@ <h4 id=shape-margin-property><span class=secno>3.4.3. </span>The ‘<a
955979 <!-- End secion "shape-margin property" -->
956980 <!-- End section "Shapes" -->
957981
958- < h2 id =conformance > < span class =secno > 4 . </ span > Conformance</ h2 >
982+ < h2 id =conformance > < span class =secno > 3 . </ span > Conformance</ h2 >
959983 <!--begin-conformance-->
960984
961985 < h3 class =no-ref id =conventions > Document conventions</ h3 >
@@ -1095,6 +1119,16 @@ <h3 class=no-num id=normative-references>Normative references</h3>
10951119 < dd style ="display: none "> <!-- keeps the doc valid if the DL is empty -->
10961120 <!---->
10971121
1122+ < dt id =CSS21 > [CSS21]
1123+
1124+ < dd > Bert Bos; et al. < a
1125+ href ="http://www.w3.org/TR/2011/REC-CSS2-20110607/ "> < cite > Cascading Style
1126+ Sheets Level 2 Revision 1 (CSS 2.1) Specification.</ cite > </ a > 7 June
1127+ 2011. W3C Recommendation. URL: < a
1128+ href ="http://www.w3.org/TR/2011/REC-CSS2-20110607/ "> http://www.w3.org/TR/2011/REC-CSS2-20110607/</ a >
1129+ </ dd >
1130+ <!---->
1131+
10981132 < dt id =CSS3-IMAGES > [CSS3-IMAGES]
10991133
11001134 < dd > Elika J. Etemad; Tab Atkins Jr. < a
@@ -1180,59 +1214,59 @@ <h2 class=no-num id=index>Index</h2>
11801214
11811215 < ul class =indexlist >
11821216 < li > authoring tool, < a href ="#authoring-tool "
1183- title ="section 4 . "> < strong > 4 .</ strong > </ a >
1217+ title ="section 3 . "> < strong > 3 .</ strong > </ a >
11841218
11851219 < li > circle, < a href ="#circle "
1186- title ="section 3 .2.1. "> < strong > 3 .2.1.</ strong > </ a >
1220+ title ="section 2 .2.1. "> < strong > 2 .2.1.</ strong > </ a >
11871221
11881222 < li > ellipse, < a href ="#ellipse "
1189- title ="section 3 .2.1. "> < strong > 3 .2.1.</ strong > </ a >
1223+ title ="section 2 .2.1. "> < strong > 2 .2.1.</ strong > </ a >
11901224
11911225 < li > Float area, < a href ="#float-area "
1192- title ="section 2. "> < strong > 2 .</ strong > </ a >
1226+ title ="section 1.3. "> < strong > 1.3 .</ strong > </ a >
11931227
11941228 < li > inset-rectangle, < a href ="#inset-rectangle "
1195- title ="section 3 .2.1. "> < strong > 3 .2.1.</ strong > </ a >
1229+ title ="section 2 .2.1. "> < strong > 2 .2.1.</ strong > </ a >
11961230
11971231 < li > polygon, < a href ="#polygon "
1198- title ="section 3 .2.1. "> < strong > 3 .2.1.</ strong > </ a >
1232+ title ="section 2 .2.1. "> < strong > 2 .2.1.</ strong > </ a >
11991233
12001234 < li > rectangle, < a href ="#rectangle "
1201- title ="section 3 .2.1. "> < strong > 3 .2.1.</ strong > </ a >
1235+ title ="section 2 .2.1. "> < strong > 2 .2.1.</ strong > </ a >
12021236
12031237 < li > renderer, < a href ="#renderer "
1204- title ="section 4 . "> < strong > 4 .</ strong > </ a >
1238+ title ="section 3 . "> < strong > 3 .</ strong > </ a >
12051239
12061240 < li > shape-image-threshold, < a href ="#shape-image-threshold "
1207- title ="section 3 .4.2. "> < strong > 3 .4.2.</ strong > </ a >
1241+ title ="section 2 .4.2. "> < strong > 2 .4.2.</ strong > </ a >
12081242 < ul >
12091243 < li > <threshold>, < a href ="#ltthresholdgt "
1210- title ="section 3 .4.2. "> < strong > 3 .4.2.</ strong > </ a >
1244+ title ="section 2 .4.2. "> < strong > 2 .4.2.</ strong > </ a >
12111245 </ ul >
12121246
12131247 < li > shape-margin, < a href ="#shape-margin "
1214- title ="section 3 .4.3. "> < strong > 3 .4.3.</ strong > </ a >
1248+ title ="section 2 .4.3. "> < strong > 2 .4.3.</ strong > </ a >
12151249
12161250 < li > shape-outside, < a href ="#shape-outside "
1217- title ="section 3 .4.1. "> < strong > 3 .4.1.</ strong > </ a >
1251+ title ="section 2 .4.1. "> < strong > 2 .4.1.</ strong > </ a >
12181252 < ul >
12191253 < li > auto, < a href ="#auto "
1220- title ="section 3 .4.1. "> < strong > 3 .4.1.</ strong > </ a >
1254+ title ="section 2 .4.1. "> < strong > 2 .4.1.</ strong > </ a >
12211255
12221256 < li > <basic-shape>, < a href ="#ltbasic-shapegt "
1223- title ="section 3 .4.1. "> < strong > 3 .4.1.</ strong > </ a >
1257+ title ="section 2 .4.1. "> < strong > 2 .4.1.</ strong > </ a >
12241258
12251259 < li > <image>, < a href ="#ltimagegt "
1226- title ="section 3 .4.1. "> < strong > 3 .4.1.</ strong > </ a >
1260+ title ="section 2 .4.1. "> < strong > 2 .4.1.</ strong > </ a >
12271261 </ ul >
12281262
12291263 < li > style sheet
12301264 < ul >
12311265 < li > as conformance class, < a href ="#style-sheet "
1232- title ="section 4 . "> < strong > 4 .</ strong > </ a >
1266+ title ="section 3 . "> < strong > 3 .</ strong > </ a >
12331267 </ ul >
12341268
1235- < li > Wrap, < a href ="#wrap " title ="section 2. "> < strong > 2 .</ strong > </ a >
1269+ < li > Wrap, < a href ="#wrap " title ="section 1.3. "> < strong > 1.3 .</ strong > </ a >
12361270 </ ul >
12371271 <!--end-index-->
12381272
0 commit comments