Skip to content

Commit 8db1dc0

Browse files
committed
Editorial changes
--HG-- extra : rebase_source : 6d5d33f4f24ecffe5c9e32b81bd18cd0d4f2266c
1 parent 6fbc4ee commit 8db1dc0

2 files changed

Lines changed: 23 additions & 24 deletions

File tree

css3-exclusions/Exclusions.src.html

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -857,7 +857,7 @@ <h4 id="step-1-resolve-exclusion-boxes-belonging-to-each-wrapping-context">Step
857857
<p>In this step, the user agent determines which <a href="http://www.w3.org/TR/CSS2/visudet.html#containing-block-details">containing block</a> each
858858
<span>exclusion area</span> belongs to. This is a simple step, based on the
859859
definition of containing blocks and elements with a computed value for 'wrap-flow'
860-
that is not <code class="css">none</code></p>
860+
that is not <code class="css">none</code>.</p>
861861

862862
<h4 id="step-2-resolve wrapping-contexts-layout-containing-blocks">Step 2: resolve wrapping contexts and layout containing blocks</h4>
863863

@@ -884,7 +884,7 @@ <h4 id="step-2-A-resolve-exclusions-position-and-size">Step 2-A: resolve exclusi
884884

885885
<h4 id="step-2-B-layout-containing-block-applying-wrapping">Step 2-B: layout containing block applying wrapping</h4>
886886

887-
<p>Finally, the content of the content of the containing block is laid out, with the
887+
<p>Finally, the content of the containing block is laid out, with the
888888
inline content wrapping around the wrapping content's exclusion areas.</p>
889889

890890
<h4 id="exclusions-processing-model-example">Example</h4>
@@ -903,12 +903,12 @@ <h4 id="exclusions-processing-model-example">Example</h4>
903903
&lt;body&gt;
904904
&lt;div id="d1" style="width:100%;height:auto;position:relative"&gt;
905905
Lorem ipsusm ...
906-
&lt;p id="e1" style="position:absolute; left:50%; top:50%;
906+
&lt;p id="e1" style="wrap-flow: both;position:absolute; left:50%; top:50%;
907907
width:40%;height:40%; margin-left:-20%;" &gt;&lt/p&gt;
908908
&lt;/div&gt;
909909
&lt;div id="d2" style="width:100%;height:auto;position:static"&gt;
910910
Lorem ipsusm ...
911-
&lt;p id="e2" style="position:absolute; right:5ex; top:1em;
911+
&lt;p id="e2" style="wrap-flow: both;position:absolute; right:5ex; top:1em;
912912
width:12ex;height:10em; margin-left:-20%;" &gt;&lt/p&gt;
913913
&lt;/div&gt;
914914
&lt;/body&gt;
@@ -1002,7 +1002,7 @@ <h6>Resolving RWC-1</h6>
10021002
<h6>Resolving RWC-2</h6>
10031003

10041004
<p>The process is similar: the position of the
1005-
<code class="idl">e1</code>exclusion needs to be resolved. Again, resolving the exclusion's
1005+
<code class="idl">e1</code> exclusion needs to be resolved. Again, resolving the exclusion's
10061006
position and size may require processing the containing block (d1 here).
10071007
It is the case here because the size and position of
10081008
<code class="idl">e1</code> depend on resolving the percentage lengths. The percentages are relative
@@ -1113,7 +1113,7 @@ <h3 id="relation-to-box-model-and-float-behavior">Relation to the box model and
11131113
}
11141114
&lt;/style&gt;
11151115

1116-
&lt;div style=”position: relative; border: 1px solid black;”&gt;
1116+
&lt;div style=”position: relative;”&gt;
11171117
&lt;div class=”exclusion”&gt;&lt;/div&gt;
11181118
Lorem ipsum dolor sit amet...
11191119
&lt;/div&gt;

css3-exclusions/Overview.html

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1254,7 +1254,7 @@ <h4 id=exclusions-processing-model-description><span class=secno>3.5.1.
12541254
This is a simple step, based on the definition of containing blocks and
12551255
elements with a computed value for &lsquo;<a href="#wrap-flow"><code
12561256
class=property>wrap-flow</code></a>&rsquo; that is not <code
1257-
class=css>none</code>
1257+
class=css>none</code>.
12581258

12591259
<h4 id="step-2-resolve wrapping-contexts-layout-containing-blocks"><span
12601260
class=secno>3.5.3. </span>Step 2: resolve wrapping contexts and layout
@@ -1287,9 +1287,8 @@ <h4 id=step-2-B-layout-containing-block-applying-wrapping><span
12871287
class=secno>3.5.5. </span>Step 2-B: layout containing block applying
12881288
wrapping</h4>
12891289

1290-
<p>Finally, the content of the content of the containing block is laid out,
1291-
with the inline content wrapping around the wrapping content's exclusion
1292-
areas.
1290+
<p>Finally, the content of the containing block is laid out, with the
1291+
inline content wrapping around the wrapping content's exclusion areas.
12931292

12941293
<h4 id=exclusions-processing-model-example><span class=secno>3.5.6.
12951294
</span>Example</h4>
@@ -1307,12 +1306,12 @@ <h4 id=exclusions-processing-model-example><span class=secno>3.5.6.
13071306
&lt;body&gt;
13081307
&lt;div id="d1" style="width:100%;height:auto;position:relative"&gt;
13091308
Lorem ipsusm ...
1310-
&lt;p id="e1" style="position:absolute; left:50%; top:50%;
1309+
&lt;p id="e1" style="wrap-flow: both;position:absolute; left:50%; top:50%;
13111310
width:40%;height:40%; margin-left:-20%;" &gt;&lt/p&gt;
13121311
&lt;/div&gt;
13131312
&lt;div id="d2" style="width:100%;height:auto;position:static"&gt;
13141313
Lorem ipsusm ...
1315-
&lt;p id="e2" style="position:absolute; right:5ex; top:1em;
1314+
&lt;p id="e2" style="wrap-flow: both;position:absolute; right:5ex; top:1em;
13161315
width:12ex;height:10em; margin-left:-20%;" &gt;&lt/p&gt;
13171316
&lt;/div&gt;
13181317
&lt;/body&gt;
@@ -1426,17 +1425,17 @@ <h6 id=resolving-rwc-1><span class=secno>3.5.6.2.1. </span>Resolving RWC-1</h6>
14261425

14271426
<h6 id=resolving-rwc-2><span class=secno>3.5.6.2.2. </span>Resolving RWC-2</h6>
14281427

1429-
<p>The process is similar: the position of the <code
1430-
class=idl>e1</code>exclusion needs to be resolved. Again, resolving the
1431-
exclusion's position and size may require processing the containing block
1432-
(d1 here). It is the case here because the size and position of <code
1433-
class=idl>e1</code> depend on resolving the percentage lengths. The
1434-
percentages are relative to the size of <code
1435-
class=idl>d1</code>&lsquo;<code class=css>s box. As a result, in order to
1436-
resolve a size for <code class=idl>d1</code></code>&rsquo;s box, a first
1437-
layout of <code class=idl>d1</code> is done without any wrapping context
1438-
(i.e., no exclusions applied). The layout yields a position and size for
1439-
<code class=idl>e1</code>&lsquo;<code class=css>s box. </code>
1428+
<p>The process is similar: the position of the <code class=idl>e1</code>
1429+
exclusion needs to be resolved. Again, resolving the exclusion's position
1430+
and size may require processing the containing block (d1 here). It is the
1431+
case here because the size and position of <code class=idl>e1</code>
1432+
depend on resolving the percentage lengths. The percentages are relative
1433+
to the size of <code class=idl>d1</code>&lsquo;<code class=css>s box. As a
1434+
result, in order to resolve a size for <code
1435+
class=idl>d1</code></code>&rsquo;s box, a first layout of <code
1436+
class=idl>d1</code> is done without any wrapping context (i.e., no
1437+
exclusions applied). The layout yields a position and size for <code
1438+
class=idl>e1</code>&lsquo;<code class=css>s box. </code>
14401439

14411440
<p>At this point, RWC-2 is resolved because the position and size of both
14421441
e1 and e2 are resolved.
@@ -1561,7 +1560,7 @@ <h3 id=relation-to-box-model-and-float-behavior><span class=secno>4.1.
15611560
}
15621561
&lt;/style&gt;
15631562

1564-
&lt;div style=”position: relative; border: 1px solid black;”&gt;
1563+
&lt;div style=”position: relative;”&gt;
15651564
&lt;div class=”exclusion”&gt;&lt;/div&gt;
15661565
Lorem ipsum dolor sit amet...
15671566
&lt;/div&gt;

0 commit comments

Comments
 (0)