@@ -137,29 +137,34 @@ <h2 id="definitions">Definitions</h2>
137137 < dfn > Exclusion element</ dfn >
138138
139139 < p >
140- An element that defines an < span > exclusion area</ span > s for other elements. The 'wrap-flow' property
141- is used to make an element an exclusion element. An exclusion element contributes its
142- < span > exclusion area</ span > to its < a href ="http://www.w3.org/TR/CSS2/visudet.html#containing-block-details "> containing block </ a > 's
143- < span > wrapping context</ span >
140+ An element that defines an < span > exclusion area</ span > for other elements. The 'wrap-flow'
141+ property is used to make an element an exclusion element. An exclusion element contributes
142+ its < span > exclusion area</ span > to its < a href ="http://www.w3.org/TR/CSS2/visudet.html#containing-block-details ">
143+ containing block's </ a > < span > wrapping context</ span >
144144 </ p >
145145
146146 < dfn > Exclusion area</ dfn >
147147 < p >
148- The area used for excluding inline flow content around an exclusion element. By default the
149- area is equivalent to the < a href ="http://www.w3.org/TR/CSS2/box.html#box-dimensions "> border box</ a > .
150- This specification's 'shape-outside' property can define arbitrary, non-rectangular exclusion areas.
148+ The area used for excluding inline flow content around an exclusion element. The
149+ exclusion area is equivalent to the < a href ="http://www.w3.org/TR/CSS2/box.html#box-dimensions ">
150+ border box</ a > for elements with 'float' property computed to 'none' and the
151+ < a href ="http://www.w3.org/TR/CSS2/box.html#box-dimensions "> margin box</ a > for elements
152+ with 'float' property computed to a value other than 'none'. This specification's
153+ 'shape-outside' property can be used to define arbitrary, non-rectangular exclusion
154+ areas.
151155 </ p >
152156
153157 < dfn > Wrapping context</ dfn >
154158
155159 < p >
156- An element's wrapping context holds the collection of areas that an element should 'wrap around'
157- when laying out its inline flow content. An element will wrap its content in the area that
158- correspond to the subtraction of its wrapping context from its own < span > content area</ span > .
160+ The wrapping context of an element is a collection of 'exclusion areas'. The wrapping
161+ context is used to wrap around inline flow content during layout. An element will
162+ wrap its inline flow content in the area that corresponds to the subtraction of
163+ its wrapping context from its own < span > content area</ span > .
159164 </ p >
160165
161166 < p >
162- An element inherit its
167+ An element inherits its
163168 < a href ="http://www.w3.org/TR/CSS2/visudet.html#containing-block-details "> containing block's</ a >
164169 wrapping context unless it specifically
165170 resets it using the 'wrap-through' property.
@@ -175,8 +180,8 @@ <h2 id="definitions">Definitions</h2>
175180 < dfn title ="outside-inside "> Outside and inside</ dfn >
176181
177182 < p >
178- In this specification, ‘ outside’ refers to DOM content that is not a descendant of an element
179- while 'inside’ refers to the element's descendants.
183+ In this specification, ' outside' refers to DOM content that is not a descendant of an element
184+ while 'inside' refers to the element's descendants.
180185 </ p >
181186
182187 < h2 id ="exclusions "> Exclusions</ h2 >
@@ -552,7 +557,7 @@ <h4 id="wrap-through-property">The 'wrap-through' Property</h4>
552557</div>
553558</ code > </ pre >
554559
555- < img class ="singleImgExample " src ="images/exclusion_wrap_through.png " alt ="Example rendering of wrap-through: wrap | none " style ="max-width:50 % "/>
560+ < img class ="singleImgExample " src ="images/exclusion_wrap_through.png " alt ="Example rendering of wrap-through: wrap | none " style ="max-width:40 % "/>
556561 </ div >
557562 <!-- End section "wrap-through property" -->
558563
@@ -602,20 +607,17 @@ <h4 id="wrap-shorthand-property">The 'wrap' Shorthand Property</h4>
602607 <!-- End section "Propagation of Exclusions" -->
603608
604609 < h3 id ="exclusions-order "> Exclusions order</ h3 >
605-
606- < div class ="issue-marker "> < p class ="desc "> < strong > Issue 1</ strong > : z-index only applies to positioned elements. Since any element can
607- be an exclusion and since they can overlap, should we say that the order of a statically positioned
608- exclusion cannot be controlled?</ p > </ div >
609-
610610 < p >
611- Exclusions follow the painting order (See [[!CSS21]] Appendix E). Exclusions are applied in reverse
612- to the document order in which they are defined. The last exclusion appears on top
613- of all other exclusion, thus it affects the inline flow content of all other preceding
614- exclusions or elements descendant of the same containing block. To change the ordering
615- of positioned exclusions, z-index can be used.
611+ Exclusions follow the painting order (See [[!CSS21]] Appendix E). Exclusions are
612+ applied in reverse to the document order in which they are defined. The last exclusion
613+ appears on top of all other exclusion, thus it affects the inline flow content of
614+ all other preceding exclusions or elements descendant of the same containing block.
615+ To change the ordering of exclusions with 'position' property computed to a value
616+ other than 'static', 'z-index' can be used. Exclusions with 'position' property
617+ computed to 'static' are not affected by the 'z-index' property, thus follow the painting
618+ order.
616619 </ p >
617-
618-
620+
619621 < div class ="example ">
620622 < p > Ordering of exclusions.</ p >
621623< pre > < code class ="html ">
@@ -753,7 +755,7 @@ <h4 id="supported-svg-shapes">Supported SVG Shapes</h4>
753755 < ul >
754756 < li > < strong > cx</ strong > - The x-axis coordinate of the center of the circle</ li >
755757 < li > < strong > cy</ strong > - The y-axis coordinate of the center of the circle</ li >
756- < li > < strong > r</ strong > - The radius of the circle. Note, cannot be expressed as a percentage. </ li >
758+ < li > < strong > r</ strong > - The radius of the circle</ li >
757759 </ ul >
758760 </ dd >
759761 < dt > ellipse(cx, cy, rx, ry)</ dt >
@@ -811,29 +813,25 @@ <h4 id='referencing-svg-shapes'>Referencing SVG shapes</h4>
811813<div class="in-a-path">...</div>
812814 </ pre > </ code >
813815 </ div >
814-
815- < p > When using the SVG syntax or referencing SVG elements to define shapes, all the lengths expressed
816- in percentages are resolved from the border box of the element. The coordinate system for the
817- shape has its origin on the top-left corder of the border box with the x-axis running to the right
818- and the y-axis running downwards. If the SVG element uses unitless coordinate values, they are equivalent
819- to using 'px' units. If the border box of the element is dependent on auto sizing (i.e., the element's
820- 'width' or 'height' property is 'auto'), then the percentage values are computed agains '0' and resolve to 0.</ p >
821-
822- <!-- End section "Shapes from SVG Syntax -->
816+ < p >
817+ When using the SVG syntax or referencing SVG elements to define shapes, all the
818+ lengths expressed in percentages are resolved from the border box of the element.
819+ The coordinate system for the shape has its origin on the top-left corder of the
820+ border box with the x-axis running to the right and the y-axis running downwards.
821+ If the SVG element uses unitless coordinate values, they are equivalent to using
822+ 'px' units. If the border box of the element is dependent on auto sizing (i.e.,
823+ the element's 'width' or 'height' property is 'auto'), then the percentage values
824+ are computed agains '0' and resolve to 0.
825+ </ p >
826+ <!-- End section "Shapes from SVG Syntax -->
823827
824828 < h3 id ="shapes-from-image "> Shapes from Image</ h3 >
825829 < p >
826830 Another way of defining shapes is by specifying a source image whose alpha channel
827- is used to compute the inside or outside shape. When shapes are computed from an image, all
828- values of the 'background-image' property can be applied.
829- </ p >
830-
831- < div class ="issue-marker "> < p class ="desc "> < strong > Issue 2</ strong > : Need to clarify what we mean by this last sentence.</ div >
832-
833- < p >
834- The shape is computed to be the path that encloses the area where the opacity of
835- the specified image is greater than the 'shape-image-threshold' value. If the 'shape-image-threshold'
836- is not specified, the initial value to be considered is 0.5.
831+ is used to compute the inside or outside shape. The shape is computed to be the
832+ path that encloses the area where the opacity of the specified image is greater
833+ than the 'shape-image-threshold' value. If the 'shape-image-threshold' is not specified,
834+ the initial value to be considered is 0.5.
837835 </ p >
838836
839837 < p class ="note ">
@@ -995,7 +993,7 @@ <h4 id="shape-inside-property">The 'shape-inside' Property</h4>
995993 </ dd >
996994 </ dl >
997995 < dl >
998- < dt > < dfn title ="'shape-inside'!!'<uri>' "> <image ></ dfn > </ dt >
996+ < dt > < dfn title ="'shape-inside'!!'<uri>' "> <uri ></ dfn > </ dt >
999997 < dd >
1000998 If the <uri> references an SVG shape element, that element defines the shape.
1001999 Otherwise, if the <uri> references an image, the shape is extracted and computed
@@ -1041,7 +1039,7 @@ <h4 id="shape-image-threshold-property">The 'shape-image-threshold' Property</h4
10411039 </ tr >
10421040 < tr >
10431041 < th > Percentages:</ th >
1044- < td > alpha channel of the image specified by <image ></ td >
1042+ < td > alpha channel of the image specified by <uri ></ td >
10451043 </ tr >
10461044 < tr >
10471045 < th > Media:</ th >
0 commit comments