@@ -93,17 +93,32 @@ <h3 id="values">Values</h3>
9393 repeated explicitly.
9494 </ p >
9595
96+ < h3 id ="definitions "> Definitions</ h3 >
97+ < dfn > Exclusion Area</ dfn >
98+ < p >
99+ The area used for excluding inline flow content around an exclusion element. By default the
100+ area is equivalent to the [[!CSS21]] border box. This specification modifies this
101+ definition by the introduction of 'shape-outside' property.
102+ </ p >
103+
104+ < dfn > Content Area</ dfn >
105+ < p >
106+ The area used for layout of the inline flow content of an element. By default the
107+ area is equivalent to the [[!CSS21]] content box. This specification modifies this
108+ definition by the introduction of 'shape-inside' property.
109+ </ p >
110+
96111 < h2 id ="exclusions "> Exclusions</ h2 >
97112 < p >
98113 Exclusions are elements that will be avoided by the user agent when laying out inline
99- flow content outside of them. The exclusion area is computed relative to the outside
100- border box of the element on which the exclusion is specified. The shape properties
101- can be used to change the shape of exclusions. Exclusions establish a wrapping context
114+ flow content outside of them. The exclusion area is computed relative to the 'exclusion
115+ area' of the element on which the exclusion is specified. The shape properties can
116+ be used to change the shape of exclusions. Exclusions establish a wrapping context
102117 for all inline flow content descendants of their containing block.
103118 </ p >
104119 < p class ="note ">
105- Note, 'Outside ' is referring to content in DOM that is not a descendant of the element
106- on which the 'wrap-flow' was specified. 'Inside' is referring to the content descendant
120+ Note, 'outside ' is referring to content in DOM that is not a descendant of the element
121+ on which the 'wrap-flow' was specified. 'Inside' is referring to the content descendants
107122 of an element.
108123 </ p >
109124
@@ -117,12 +132,12 @@ <h4 id="wrap-flow-property">The 'wrap-flow' Property</h4>
117132 < p >
118133 Setting the 'wrap-flow' property to 'both', 'left', 'right', 'maximum' or 'clear' enables the
119134 exclusion inline flow content wrapping features, causing outside content to wrap
120- around its border box . The initial value for this property is 'auto', in this case
135+ around its exclusion area . The initial value for this property is 'auto', in this case
121136 the element will not be considered for wrapping inline flow content unless the 'float'
122- property is specified to a value other than 'clear '.
137+ property is specified to a value other than 'none '.
123138 </ p >
124139 < p >
125- The element will be considered an exclusion for all inline flow content descendent
140+ The element will be considered as an exclusion for all inline flow content descendants
126141 of the exclusions' containing block.
127142 </ p >
128143 < table class ="propdef ">
@@ -201,13 +216,13 @@ <h4 id="wrap-flow-property">The 'wrap-flow' Property</h4>
201216 the areas to the left and right of the exclusion empty.
202217 </ dd >
203218 </ dl >
204- < p class =" note " >
205- Note, Floats are considered exclusions for compatibility and 'wrap-flow' computes
206- to 'auto' when the 'float' property is anything other than 'clear'.
207- </ p >
219+
220+ Note, floats are considered exclusions for compatibility and 'wrap-flow' computes
221+ to 'auto' when the 'float' property is anything other than 'clear'.
222+
208223 < div class ="example ">
209224 < p >
210- wrap-flow: auto applied to an absolutely positioned element:
225+ The ' wrap-flow' property values applied to an absolutely positioned element.
211226 </ p >
212227< pre > < code class ="html ">
213228<style type="text/css">
@@ -255,11 +270,11 @@ <h4 id="wrap-flow-property">The 'wrap-flow' Property</h4>
255270
256271 < h3 id ="scope-and-effect-of-exclusions "> Scope and Effect of Exclusions</ h3 >
257272 < p >
258- Exclusions affect the inline flow content inside of their containing blocks (defined
259- in < a href ="http://www.w3.org/TR/CSS2/visudet.html#containing-block-details "> CSS 2.1
260- 10.1</ a > ) and that of all descendent elements of the same containing block.
261- All inline flow content inside the containing block of the exclusions is affected.
262- To stop the effect of exclusions defined outside any element, the 'wrap-through'
273+ An exclusion affects the inline flow content descended from the exclusion's containing
274+ blocks (defined in < a href ="http://www.w3.org/TR/CSS2/visudet.html#containing-block-details ">
275+ CSS 2.1 10.1</ a > ) and that of all descendant elements of the same containing
276+ block. All inline flow content inside the containing block of the exclusions is
277+ affected. To stop the effect of exclusions defined outside any element, the 'wrap-through'
263278 property can be used (see definition of Propagation of Exclusions below).
264279 </ p >
265280
@@ -347,13 +362,6 @@ <h4 id="wrap-padding-property">The 'wrap-padding' Property</h4>
347362 < td > the absolute length</ td >
348363 </ tr >
349364 </ table >
350-
351- < dfn > Content Area</ dfn >
352- < p >
353- The area used for layout of the inline flow content of an element. By default the
354- area is equivalent to the [[!CSS21]] content box. This specification modifies this
355- definition by the introduction of 'shape-inside' property.
356- </ p >
357365 <!-- End section "wrap-padding property" -->
358366 <!-- End section "Scope and Efect of Exclusions" -->
359367
@@ -362,9 +370,9 @@ <h3 id="propagation-of-exclusions">Propagation of Exclusions</h3>
362370 Exclusions can be used to wrap all inline flow content within all descendants of
363371 the containing block of the exclusion. In order to prevent wrapping of inline flow
364372 content on any element around exclusions, the 'wrap-through' property can be used.
365- Setting the property to 'none' will prevent the wrapping of inline flow content
366- around exclusion elements defined outside. The 'wrap-through' property does not
367- have an effect over exclusions contained inside the element.
373+ Setting the 'wrap-through' property to 'none' will prevent the wrapping of inline
374+ flow content around exclusion elements defined outside. The 'wrap-through' property
375+ does not have an effect over exclusions contained inside the element.
368376 </ p >
369377
370378 < h4 id ="wrap-through-property "> The 'wrap-through' Property</ h4 >
@@ -418,7 +426,7 @@ <h4 id="wrap-through-property">The 'wrap-through' Property</h4>
418426 </ dl >
419427 < div class ="example ">
420428 < p >
421- wrap-through - controlling the effect of exclusions
429+ Using the ' wrap-through' property to control the effect of exclusions.
422430 </ p >
423431< pre > < code class ="html ">
424432<style type="text/css">
@@ -476,7 +484,7 @@ <h4 id="wrap-shorthand-property">The 'wrap' Shorthand Property</h4>
476484 </ tr >
477485 </ table >
478486 < p >
479- The 'wrap' property is a shorthand property for setting the exclusoins properties
487+ The 'wrap' property is a shorthand property for setting the exclusions properties
480488 at the same place in the style sheet.
481489 </ p >
482490 <!-- End section "wrap shorthand property" -->
@@ -487,12 +495,12 @@ <h3 id="order-of-exclusions">Order of Exclusions</h3>
487495 The ordering of exclusions follows the visual order. Exclusions are applied in reverse
488496 to the document order in which they are defined. The last exclusion appears on top
489497 of all other exclusion, thus it affects the inline flow content of all other preceding
490- exclusions or elements descendent of the same containing block. To change the ordering
498+ exclusions or elements descendant of the same containing block. To change the ordering
491499 of positioned exclusions, z-index can be used.
492500 </ p >
493501
494502 < div class ="example ">
495- < p > Ordering of exclusions</ p >
503+ < p > Ordering of exclusions. </ p >
496504< pre > < code class ="html ">
497505<style type="text/css">
498506 .exclusion {
@@ -535,7 +543,7 @@ <h3 id="processing-model-of-exclusions">Processing Model of Exclusions</h3>
535543 < p >
536544 Exclusions can be specified on positioned elements and elements can be positioned
537545 from their < a href ="http://www.w3.org/TR/CSS21/visudet.html#static-position "> static
538- position</ a > . Since, the static position of such elements depends on the inline
546+ position</ a > . Since, the static position of such elements depends on the inline
539547 flow content affected by the exclusion itself; there is a circular dependency between
540548 the two layout tasks. To break this circular dependency a two-pass layout approach
541549 is recommended. The first layout pass computes the static positions of all auto-positioned
@@ -549,8 +557,8 @@ <h3 id="processing-model-of-exclusions">Processing Model of Exclusions</h3>
549557 </ p >
550558 < p >
551559 Similar dependency exists for exclusions whose size or position is specified in
552- percentage and their containing block size is specified as 'auto'. In such cases
553- the size or position of the exclusion is calculated based on the size of the containing
560+ percentage and the containing block size is specified as 'auto'. In such cases the
561+ size or position of the exclusion is calculated based on the size of the containing
554562 block calculated in the first layout pass.
555563 </ p >
556564 < p >
@@ -578,14 +586,14 @@ <h2 id="shapes">Shapes</h2>
578586 'table-cell' or 'inline-block'.
579587 </ p >
580588 < p class ="note ">
581- Note, While the boundaries used for wrapping inline flow content outside and inside
589+ Note, while the boundaries used for wrapping inline flow content outside and inside
582590 an element can be defined using shapes, the actual box model does not change. If
583591 the element has specified margins, borders or paddings they will be computed and
584- rendered according to the CSS Box Model module.
592+ rendered according to the [[CSS3- Box]] module.
585593 </ p >
586594
587595 < div class ="example ">
588- < p > CSS 'shape' and CSS box model relation</ p >
596+ < p > CSS 'shape' and CSS box model relation. </ p >
589597< pre > < code class ="html ">
590598<style type="text/css">
591599 .exclusion {
@@ -632,7 +640,7 @@ <h4 id="supported-svg-shapes">Supported SVG Shapes</h4>
632640 < ul >
633641 < li > < strong > cx</ strong > - The x-axis coordinate of the center of the circle</ li >
634642 < li > < strong > cy</ strong > - The y-axis coordinate of the center of the circle</ li >
635- < li > < strong > r</ strong > - The radius of the circle. Note, Cannot be expressed as a percentage.</ li >
643+ < li > < strong > r</ strong > - The radius of the circle. Note, cannot be expressed as a percentage.</ li >
636644 </ ul >
637645 </ dd >
638646 </ dl >
@@ -664,11 +672,9 @@ <h4 id="supported-svg-shapes">Supported SVG Shapes</h4>
664672 </ dd >
665673 </ dl >
666674
667- < p class ="note ">
668- Note, in case the polygon is not closed the user-agent will assume an additional
669- vertex at the end.
670- </ p >
671- <!-- End section "Shapes from SVG Syntax -->
675+ When a 'polygon' is not closed the user-agent will assume an additional vertex
676+ at the end.
677+ <!-- End section "Shapes from SVG Syntax -->
672678
673679 < h3 id ="shapes-from-image "> Shapes from Image</ h3 >
674680 < p >
@@ -682,7 +688,7 @@ <h3 id="shapes-from-image">Shapes from Image</h3>
682688 is not specified, the initial value to be considered is 0.5.
683689 </ p >
684690 < p class ="note ">
685- Note, Images can also define cavities and inline flow content should wrap inside
691+ Note, images can also define cavities and inline flow content should wrap inside
686692 them. In order to avoid that, another exclusion element can be overlaid.
687693 </ p >
688694 <!-- End section "Shapes from image" -->
@@ -691,10 +697,10 @@ <h3 id="declaring-shapes">Declaring Shapes</h3>
691697 < p >
692698 Shapes can be declared using the 'shape-outside', 'shape-inside' or a combination
693699 for both properties. Using the 'shape-outside' property changes the geometry of
694- default shape used for exclusions, which is the outter border box of the element.
695- The outside shape has visual effect when the element is exclusion (otherwise this
696- property is ignored ). Using the 'shape-inside' property, the content box of an element
697- is redefined and inline flow content wraps into that shape.
700+ default shape used for exclusions, which is the 'exclusion area' of the element.
701+ The outside shape has visual effect when the element is an exclusion (otherwise
702+ the property has no affect ). Using the 'shape-inside' property, the content box
703+ of an element is redefined and inline flow content wraps into that shape.
698704 </ p >
699705
700706 < h4 id ="shape-outside-property "> The 'shape-outside' Property</ h4 >
@@ -765,11 +771,6 @@ <h4 id="shape-inside-property">The 'shape-inside' Property</h4>
765771 The 'shape-inside' modifies the shape of the inner inline flow content from rectangular
766772 content box to an arbitrary geometry.
767773 </ p >
768- < p >
769- When the property is set to 'auto', the shape is taken from the value of 'shape-outside'.
770- In case both values of 'shape-inside' and 'shape-outside' are specified as 'auto',
771- the content box of the element is used as the shape.
772- </ p >
773774
774775 < table class ="propdef ">
775776 < tr >
@@ -836,8 +837,8 @@ <h4 id="shape-inside-property">The 'shape-inside' Property</h4>
836837 < h4 id ="shape-image-threshold-property "> The 'shape-image-threshold' Property</ h4 >
837838 < p >
838839 The 'shape-image-threshold' defines the alpha channel threshold used to extract
839- the shape using an image. The initial value of 0.5 means that all the pixels that
840- are more than 50% transparent define the path of the exclusion shape. The 'shape-image-threshold'
840+ the shape using an image. A value of 0.5 means that all the pixels that are more
841+ than 50% transparent define the path of the exclusion shape. The 'shape-image-threshold'
841842 applies to both 'shape-outside' and 'shape-inside'.
842843 </ p >
843844 < p class ="note ">
@@ -883,9 +884,9 @@ <h4 id="shape-image-threshold-property">The 'shape-image-threshold' Property</h4
883884 < dl >
884885 < dt > < dfn title ="'shape-image-threshold'!!'<alphavalue>' "> <alphavalue></ dfn > </ dt >
885886 < dd >
886- Syntactically a <number>. The shape-image-threshold setting to be used when
887- extracting a shape from an image. Any values outside the range 0.0 (fully transparent)
888- to 1.0 (fully opaque) will be clamped to this range.
887+ A <number> value used to set the threshold used for extracting a shape from
888+ an image. Any values outside the range 0.0 (fully transparent) to 1.0 (fully opaque )
889+ will be clamped to this range.
889890 </ dd >
890891 </ dl >
891892 <!-- End section "The shape-image-threshold property" -->
@@ -931,7 +932,7 @@ <h4 id="shape-shorthand-property">The 'shape' Shorthand Property</h4>
931932 </ p >
932933
933934 < div class ="example ">
934- < p > Style declaration using the 'shape' shorthand property</ p >
935+ < p > Style declaration using the 'shape' shorthand property. </ p >
935936< pre > < code class ="html ">
936937<style type="text/css">
937938 .shape {
0 commit comments