Skip to content

Commit 04ae970

Browse files
tabatkinsastearns
authored andcommitted
[css-shapes-1] Move the grammar definitions of basic-shapes into a <pre class=prod>
1 parent 24ed7b1 commit 04ae970

File tree

1 file changed

+47
-25
lines changed

1 file changed

+47
-25
lines changed

css-shapes-1/Overview.bs

+47-25
Original file line numberDiff line numberDiff line change
@@ -322,16 +322,48 @@ Basic Shapes</h2>
322322
<h3 id="supported-basic-shapes">
323323
Supported Shapes</h3>
324324

325-
The following shapes are supported.
326-
All <<basic-shape>> values use
327-
<a href="https://www.w3.org/TR/css3-values/#functional-notation">functional notation</a>
328-
and are defined here using the
329-
<a href="https://www.w3.org/TR/css3-values/#value-defs">Value Definition Syntax</a>.
325+
The <<basic-shape>> functions are:
326+
327+
<pre class=prod>
328+
<<inset()>> = inset(
329+
<<length-percentage>>{1,4}
330+
[ round <<'border-radius'>> ]?
331+
)
332+
333+
<<xywh()>> = xywh(
334+
<<length-percentage>>{2} <<length-percentage [0, ∞]>>{2}
335+
[ round <<'border-radius'>> ]?
336+
)
337+
338+
<<rect()>> = rect(
339+
[ <<length-percentage>> | auto ]{4}
340+
[ round <<'border-radius'>> ]?
341+
)
342+
343+
<<circle()>> = circle(
344+
<<shape-radius>>?
345+
[ at <<position>> ]?
346+
)
347+
348+
<<ellipse()>> = ellipse(
349+
<<shape-radius>>{2}?
350+
[ at <<position>> ]?
351+
)
352+
353+
<<polygon()>> = polygon(
354+
<<'fill-rule'>>? ,
355+
[<<length-percentage>> <<length-percentage>>]#
356+
)
357+
358+
<<path()>> = path(
359+
<<'fill-rule'>>? ,
360+
<<string>>
361+
)
362+
</pre>
363+
330364

331365
<dl dfn-for="<basic-shape>">
332-
<dt><dfn>inset()</dfn> =
333-
inset( <<length-percentage>>{1,4} [ round <<'border-radius'>> ]? )
334-
</dt>
366+
<dt><dfn>inset()</dfn>
335367
<dd>
336368
Defines an inset rectangle
337369
via insets from each edge of the [=reference box=].
@@ -364,8 +396,7 @@ Supported Shapes</h3>
364396
define rounded corners for the rectangle
365397
using the 'border-radius' shorthand syntax.
366398

367-
<dt><dfn>xywh()</dfn> =
368-
xywh( <<length-percentage>>{2} <<length-percentage [0, ∞]>>{2} [ round <<'border-radius'>> ]? )
399+
<dt><dfn>xywh()</dfn>
369400
<dd>
370401
Defines a rectangle
371402
via offsets from the top and left edge of the [=reference box=],
@@ -385,7 +416,6 @@ Supported Shapes</h3>
385416
using the 'border-radius' shorthand syntax.
386417

387418
<dt><dfn>rect()</dfn> =
388-
rect( [ <<length-percentage>> | auto ]{4} [ round <<'border-radius'>> ]? )
389419
<dd>
390420
Defines a rectangle
391421
via insets from the top and left edges of the [=reference box=].
@@ -425,9 +455,7 @@ Supported Shapes</h3>
425455
define rounded corners for the rectangle
426456
using the 'border-radius' shorthand syntax.)
427457

428-
<dt><dfn>circle()</dfn> =
429-
circle( <<shape-radius>>? [ at <<position>> ]? )
430-
</dt>
458+
<dt><dfn>circle()</dfn>
431459
<dd>
432460
<ul>
433461
<li>
@@ -447,10 +475,8 @@ Supported Shapes</h3>
447475
this defaults to <css>center</css> if omitted.
448476
</li>
449477
</ul>
450-
</dd>
451-
<dt><dfn>ellipse()</dfn> =
452-
ellipse( [ <<shape-radius>>{2} ]? [ at <<position>> ]? )
453-
</dt>
478+
479+
<dt><dfn>ellipse()</dfn>
454480
<dd>
455481
<ul>
456482
<li>
@@ -473,10 +499,8 @@ Supported Shapes</h3>
473499
this defaults to <css>center</css> if omitted.
474500
</li>
475501
</ul>
476-
</dd>
477-
<dt><dfn>polygon()</dfn> =
478-
polygon( <<'fill-rule'>>? , [<<length-percentage>> <<length-percentage>>]# )
479-
</dt>
502+
503+
<dt><dfn>polygon()</dfn>
480504
<dd>
481505
<ul>
482506
<li>
@@ -499,9 +523,7 @@ Supported Shapes</h3>
499523
by connecting the last vertex
500524
with the first vertex of the list.
501525

502-
</dd>
503-
<dt><dfn>path()</dfn> =
504-
path( <<'fill-rule'>>? , <<string>> )
526+
<dt><dfn>path()</dfn>
505527
</dt>
506528
<dd dfn-type=value dfn-for="path()">
507529
<ul>

0 commit comments

Comments
 (0)