Skip to content

Commit 69e693e

Browse files
astearnsastearns
committed
[css-shapes] editorial cleanup
1 parent 0a867de commit 69e693e

2 files changed

Lines changed: 25 additions & 21 deletions

File tree

‎css-shapes/Overview.html‎

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
</p>
6464
<h1 class="p-name no-ref" id=title>CSS Shapes Module Level 1</h1>
6565
<h2 class="no-num no-toc no-ref heading settled heading" id=subtitle><span class=content>Editor’s Draft,
66-
<span class=dt-updated><span class=value-title title=20131120>20 November 2013</span></span></span></h2>
66+
<span class=dt-updated><span class=value-title title=20131121>21 November 2013</span></span></span></h2>
6767
<div data-fill-with=spec-metadata><dl><dt>This version:<dd><a class=u-url href=http://dev.w3.org/csswg/css-shapes/>http://dev.w3.org/csswg/css-shapes/</a><dt>Latest version:<dd><a href=http://www.w3.org/TR/css-shapes/>http://www.w3.org/TR/css-shapes/</a><dt>Editor’s Draft:<dd><a href=http://dev.w3.org/csswg/css-shapes/>http://dev.w3.org/csswg/css-shapes/</a>
6868
<dt>Feedback:</dt>
6969
<dd><a href="mailto:www-style@w3.org?subject=%5Bcss-shapes%5D%20feedback">www-style@w3.org</a>
@@ -313,7 +313,7 @@ <h2 class="heading settled heading" data-level=2 id=relation-to-box-model-and-fl
313313
<p> A shape with no extent will create
314314
a <a data-link-type=dfn href=#float-area title="float area">float area</a> with no extent.
315315
Because <a data-link-type=dfn href=#wrap title=wrap>wrapping</a> only considers the <a data-link-type=dfn href=#float-area title="float area">float area</a>,
316-
the shape below applied to a left float
316+
either shape below applied to a float
317317
will allow inline content
318318
to flow through all of the float’s box.
319319

@@ -441,7 +441,7 @@ <h3 class="heading settled heading" data-level=3.1 id=supported-basic-shapes><sp
441441

442442
</dd>
443443
<dt><dfn class=css-code data-dfn-type=function data-export="" id=funcdef-circle title=circle()>circle()<a class=self-link href=#funcdef-circle></a></dfn> =
444-
circle( [<a class="production css-code" data-link-type=type href=#typedef-shape-radius title="<shape-radius>">&lt;shape-radius&gt;</a>] [at <a class="production css-code" data-link-type=type href=http://dev.w3.org/csswg/css-values-3/#position-value title="<position>">&lt;position&gt;</a>]? | at <a class="production css-code" data-link-type=type href=http://dev.w3.org/csswg/css-values-3/#position-value title="<position>">&lt;position&gt;</a> )
444+
circle( [<a class="production css-code" data-link-type=type href=#typedef-shape-radius title="<shape-radius>">&lt;shape-radius&gt;</a>]? [at <a class="production css-code" data-link-type=type href=http://dev.w3.org/csswg/css-values-3/#position-value title="<position>">&lt;position&gt;</a>]? )
445445
</dt>
446446
<dd>
447447
<ul>
@@ -464,16 +464,17 @@ <h3 class="heading settled heading" data-level=3.1 id=supported-basic-shapes><sp
464464
</ul>
465465
</dd>
466466
<dt><dfn class=css-code data-dfn-type=function data-export="" id=funcdef-ellipse title=ellipse()>ellipse()<a class=self-link href=#funcdef-ellipse></a></dfn> =
467-
ellipse( [<a class="production css-code" data-link-type=type href=#typedef-shape-radius title="<shape-radius>">&lt;shape-radius&gt;</a>{2}] [at <a class="production css-code" data-link-type=type href=http://dev.w3.org/csswg/css-values-3/#position-value title="<position>">&lt;position&gt;</a>]? | at <a class="production css-code" data-link-type=type href=http://dev.w3.org/csswg/css-values-3/#position-value title="<position>">&lt;position&gt;</a> )
467+
ellipse( [<a class="production css-code" data-link-type=type href=#typedef-shape-radius title="<shape-radius>">&lt;shape-radius&gt;</a>{2}]? [at <a class="production css-code" data-link-type=type href=http://dev.w3.org/csswg/css-values-3/#position-value title="<position>">&lt;position&gt;</a>]? )
468468
</dt>
469469
<dd>
470470
<ul>
471471
<li>
472472
The shape-radius arguments represent
473-
<strong>rx</strong>, and
473+
<strong>rx</strong> and
474474
<strong>ry</strong>,
475475
the x-axis and y-axis radii
476-
of the ellipse.
476+
of the ellipse,
477+
in that order.
477478
Negative values for either radius are invalid.
478479
</li>
479480
<li>
@@ -673,7 +674,7 @@ <h2 class="heading settled heading" data-level=4 id=shapes-from-image><span clas
673674
<h2 class="heading settled heading" data-level=5 id=shapes-from-box-values><span class=secno>5 </span><span class=content>
674675
Shapes from Box Values</span><a class=self-link href=#shapes-from-box-values></a></h2>
675676

676-
<p> Shapes can be defined by reference to edges in the <a href=http://www.w3.org/TR/CSS21/box.html#box-dimensions>CSS Box Model</a>. These edges include border-radius curvature. The definitions of the <dfn class=css-code data-dfn-type=type data-export="" id=typedef-box><a class="production css-code" data-link-type=type href=#typedef-box title="<box>">&lt;box&gt;</a><a class=self-link href=#typedef-box></a></dfn> values are:
677+
<p> Shapes can be defined by reference to edges in the <a href=http://www.w3.org/TR/CSS21/box.html#box-dimensions>CSS Box Model</a>. These edges include <a href=http://dev.w3.org/csswg/css-backgrounds/#corner-shaping>border-radius curvature</a> <a data-biblio-type=normative data-link-type=biblio href=#css3bg title=css3bg>[CSS3BG]</a>. The definitions of the <dfn class=css-code data-dfn-type=type data-export="" id=typedef-box><a class="production css-code" data-link-type=type href=#typedef-box title="<box>">&lt;box&gt;</a><a class=self-link href=#typedef-box></a></dfn> values are:
677678

678679
<p> The <dfn data-dfn-type=dfn data-noexport="" id=margin-box>margin-box<a class=self-link href=#margin-box></a></dfn> value defines the shape
679680
enclosed by the outside margin edge.
@@ -704,10 +705,10 @@ <h2 class="heading settled heading" data-level=5 id=shapes-from-box-values><span
704705
the box values define these shapes:
705706

706707
<p> <ul>
707-
<li>margin-box: the box containing all of the yellow pixels</li>
708-
<li>border-box: the box containing all of the black pixels</li>
709-
<li>padding-box: the box containing all of the mauve pixels</li>
710-
<li>content-box: the box containing all of the blue pixels</li>
708+
<li>margin-box: the shape containing all of the yellow pixels</li>
709+
<li>border-box: the shape containing all of the black pixels</li>
710+
<li>padding-box: the shape containing all of the mauve pixels</li>
711+
<li>content-box: the shape containing all of the blue pixels</li>
711712
</ul>
712713

713714
<div class=figure>
@@ -937,6 +938,7 @@ <h2 class="no-num heading settled heading" id=change-log><span class=content>
937938
<h3 class="no-num heading settled heading" id=20130620><span class=content>
938939
Since <a href=http://www.w3.org/TR/2013/WD-css-shapes-1-20130620/>June 20th 2013</a></span><a class=self-link href=#20130620></a></h3>
939940
<ul>
941+
<li>Added shape from box value section</li>
940942
<li>Updated basic-shape interpolation</li>
941943
<li>Allow negative insets, disallow negative radii</li>
942944
<li>Changed relevant to reference</li>

‎css-shapes/Overview.src.html‎

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ <h2 id="relation-to-box-model-and-float-behavior">
192192
A shape with no extent will create
193193
a <a>float area</a> with no extent.
194194
Because <a title='wrap'>wrapping</a> only considers the <a>float area</a>,
195-
the shape below applied to a left float
195+
either shape below applied to a float
196196
will allow inline content
197197
to flow through all of the float's box.
198198

@@ -323,7 +323,7 @@ <h3 id="supported-basic-shapes">
323323

324324
</dd>
325325
<dt><dfn>circle()</dfn> =
326-
circle( [<<shape-radius>>] [at <<position>>]? | at <<position>> )
326+
circle( [<<shape-radius>>]? [at <<position>>]? )
327327
</dt>
328328
<dd>
329329
<ul>
@@ -346,16 +346,17 @@ <h3 id="supported-basic-shapes">
346346
</ul>
347347
</dd>
348348
<dt><dfn>ellipse()</dfn> =
349-
ellipse( [<<shape-radius>>{2}] [at <<position>>]? | at <<position>> )
349+
ellipse( [<<shape-radius>>{2}]? [at <<position>>]? )
350350
</dt>
351351
<dd>
352352
<ul>
353353
<li>
354354
The shape-radius arguments represent
355-
<strong>rx</strong>, and
355+
<strong>rx</strong> and
356356
<strong>ry</strong>,
357357
the x-axis and y-axis radii
358-
of the ellipse.
358+
of the ellipse,
359+
in that order.
359360
Negative values for either radius are invalid.
360361
</li>
361362
<li>
@@ -557,7 +558,7 @@ <h2 id="shapes-from-image">
557558
<h2 id="shapes-from-box-values">
558559
Shapes from Box Values</h2>
559560

560-
Shapes can be defined by reference to edges in the <a href="http://www.w3.org/TR/CSS21/box.html#box-dimensions">CSS Box Model</a>. These edges include border-radius curvature. The definitions of the <dfn><<box>></dfn> values are:
561+
Shapes can be defined by reference to edges in the <a href="http://www.w3.org/TR/CSS21/box.html#box-dimensions">CSS Box Model</a>. These edges include <a href="http://dev.w3.org/csswg/css-backgrounds/#corner-shaping">border-radius curvature</a> [[!CSS3BG]]. The definitions of the <dfn><<box>></dfn> values are:
561562

562563
The <dfn>margin-box</dfn> value defines the shape
563564
enclosed by the outside margin edge.
@@ -588,10 +589,10 @@ <h2 id="shapes-from-box-values">
588589
the box values define these shapes:
589590

590591
<ul>
591-
<li>margin-box: the box containing all of the yellow pixels</li>
592-
<li>border-box: the box containing all of the black pixels</li>
593-
<li>padding-box: the box containing all of the mauve pixels</li>
594-
<li>content-box: the box containing all of the blue pixels</li>
592+
<li>margin-box: the shape containing all of the yellow pixels</li>
593+
<li>border-box: the shape containing all of the black pixels</li>
594+
<li>padding-box: the shape containing all of the mauve pixels</li>
595+
<li>content-box: the shape containing all of the blue pixels</li>
595596
</ul>
596597

597598
<div class="figure">
@@ -855,6 +856,7 @@ <h2 class="no-num" id="change-log">
855856
<h3 class="no-num" id="20130620">
856857
Since <a href="http://www.w3.org/TR/2013/WD-css-shapes-1-20130620/">June 20th 2013</a></h3>
857858
<ul>
859+
<li>Added shape from box value section</li>
858860
<li>Updated basic-shape interpolation</li>
859861
<li>Allow negative insets, disallow negative radii</li>
860862
<li>Changed relevant to reference</li>

0 commit comments

Comments
 (0)