Skip to content

Commit 798ba91

Browse files
authored
[css-box-4][css-backgrounds-4][css-shapes-1] Cleanup <*-box> definitions (#9505)
* [css-box-4][css-backgrounds-4][css-shapes-1] Replace <box> definition with <visual-box> * [css-box] Restore <box> as the namespace for all box-egde keywords * [css-box] Add missing <box> definition * [css-box] Define box-edge keywords with appropriate namespaces * [css-box] Do not export <box> definition * [css-box] Define each box keyword with all namespaces
1 parent ad03cff commit 798ba91

File tree

4 files changed

+28
-28
lines changed

4 files changed

+28
-28
lines changed

css-backgrounds-4/Overview.bs

+2-2
Original file line numberDiff line numberDiff line change
@@ -160,15 +160,15 @@ Painting Area: the 'background-clip' property</h3>
160160
The syntax of the property is given with
161161

162162
<pre class=prod>
163-
<dfn>&lt;bg-clip></dfn> = <<box>> | border | text
163+
<dfn>&lt;bg-clip></dfn> = <<visual-box>> | border | text
164164
</pre>
165165

166166
Issue: Or should this be defining the <css>-webkit-background-clip</css> property,
167167
saying that all the values are identical,
168168
with this additional ''text'' value?
169169

170170
<dl dfn-type=value dfn-for="background-clip, <bg-clip>">
171-
<dt><dfn><<box>></dfn>
171+
<dt><dfn><<visual-box>></dfn>
172172
<dd>
173173
The background is painted within (clipped to)
174174
the specified box of the element.

css-box-3/Overview.bs

+12-12
Original file line numberDiff line numberDiff line change
@@ -211,42 +211,42 @@ The CSS Box Model {#box-model}
211211
Box-edge Keywords {#keywords}
212212
-----------------
213213

214-
The following CSS keywords are defined for use
214+
The following <dfn noexport>&lt;box></dfn> CSS keywords are defined for use
215215
in properties (such as 'transform-box' and 'background-clip')
216216
that need to refer to various box edges:
217217

218-
<dl dfn-for="<box>,<shape-box>,<geometry-box>" dfn-type=value>
219-
<dt><dfn>content-box</dfn>
218+
<dl dfn-type=value>
219+
<dt><dfn dfn-for="<box>,<visual-box>,<layout-box>,<shape-box>,<geometry-box>,<paint-box>,<coord-box>">content-box</dfn>
220220
<dd>
221221
Refers to the [=content box=] or [=content edge=].
222222
(In an SVG context, treated as ''<box>/fill-box''.)
223223

224-
<dt><dfn>padding-box</dfn>
224+
<dt><dfn dfn-for="<box>,<visual-box>,<layout-box>,<shape-box>,<geometry-box>,<paint-box>,<coord-box>">padding-box</dfn>
225225
<dd>
226226
Refers to the [=padding box=] or [=padding edge=].
227227
(In an SVG context, treated as ''<box>/fill-box''.)
228228

229-
<dt><dfn>border-box</dfn>
229+
<dt><dfn dfn-for="<box>,<visual-box>,<layout-box>,<shape-box>,<geometry-box>,<paint-box>,<coord-box>">border-box</dfn>
230230
<dd>
231231
Refers to the [=border box=] or [=border edge=].
232232
(In an SVG context, treated as ''<box>/stroke-box''.)
233233

234-
<dt><dfn>margin-box</dfn>
234+
<dt><dfn dfn-for="<box>,<layout-box>,<shape-box>,<geometry-box>">margin-box</dfn>
235235
<dd>
236236
Refers to the [=margin box=] or [=margin edge=].
237237
(In an SVG context, treated as ''<box>/stroke-box''.)
238238

239-
<dt><dfn>fill-box</dfn>
239+
<dt><dfn dfn-for="<box>,<geometry-box>,<paint-box>,<coord-box>">fill-box</dfn>
240240
<dd>
241241
Refers to the [=object bounding box=] or its edges.
242242
(In a CSS box context, treated as ''<box>/content-box''.)
243243

244-
<dt><dfn>stroke-box</dfn>
244+
<dt><dfn dfn-for="<box>,<geometry-box>,<paint-box>,<coord-box>">stroke-box</dfn>
245245
<dd>
246246
Refers to the [=stroke bounding box=] or its edges.
247247
(In a CSS box context, treated as ''<box>/border-box''.)
248248

249-
<dt><dfn>view-box</dfn>
249+
<dt><dfn dfn-for="<box>,<geometry-box>,<coord-box>">view-box</dfn>
250250
<dd>
251251
Refers to the nearest [=SVG viewport=] element’s
252252
<dfn dfn lt="SVG viewport origin box" local-lt="origin box">origin box</dfn>,
@@ -268,9 +268,9 @@ Box-edge Keywords {#keywords}
268268
For convenience, the following value types are defined:
269269
<pre class="prod">
270270
<dfn><<visual-box>></dfn> = content-box | padding-box | border-box
271-
<dfn><<layout-box>></dfn> = content-box | padding-box | border-box | margin-box
272-
<dfn><<paint-box>></dfn> = content-box | padding-box | border-box | fill-box | stroke-box
273-
<dfn><<coord-box>></dfn> = content-box | padding-box | border-box | fill-box | stroke-box | view-box
271+
<dfn><<layout-box>></dfn> = <<visual-box>> | margin-box
272+
<dfn><<paint-box>></dfn> = <<visual-box>> | fill-box | stroke-box
273+
<dfn><<coord-box>></dfn> = <<paint-box>> | view-box
274274
</pre>
275275

276276
Margins {#margins}

css-box-4/Overview.bs

+12-12
Original file line numberDiff line numberDiff line change
@@ -197,42 +197,42 @@ The CSS Box Model {#box-model}
197197
Box-edge Keywords {#keywords}
198198
-----------------
199199

200-
The following CSS keywords are defined for use
200+
The following <dfn noexport>&lt;box></dfn> CSS keywords are defined for use
201201
in properties (such as 'transform-box' and 'background-clip')
202202
that need to refer to various box edges:
203203

204-
<dl dfn-for="<box>,<shape-box>,<geometry-box>" dfn-type=value>
205-
<dt><dfn>content-box</dfn>
204+
<dl dfn-type=value>
205+
<dt><dfn dfn-for="<box>,<visual-box>,<layout-box>,<shape-box>,<geometry-box>,<paint-box>,<coord-box>">content-box</dfn>
206206
<dd>
207207
Refers to the [=content box=] or [=content edge=].
208208
(In an SVG context, treated as ''<box>/fill-box''.)
209209

210-
<dt><dfn>padding-box</dfn>
210+
<dt><dfn dfn-for="<box>,<visual-box>,<layout-box>,<shape-box>,<geometry-box>,<paint-box>,<coord-box>">padding-box</dfn>
211211
<dd>
212212
Refers to the [=padding box=] or [=padding edge=].
213213
(In an SVG context, treated as ''<box>/fill-box''.)
214214

215-
<dt><dfn>border-box</dfn>
215+
<dt><dfn dfn-for="<box>,<visual-box>,<layout-box>,<shape-box>,<geometry-box>,<paint-box>,<coord-box>">border-box</dfn>
216216
<dd>
217217
Refers to the [=border box=] or [=border edge=].
218218
(In an SVG context, treated as ''<box>/stroke-box''.)
219219

220-
<dt><dfn>margin-box</dfn>
220+
<dt><dfn dfn-for="<box>,<layout-box>,<shape-box>,<geometry-box>">margin-box</dfn>
221221
<dd>
222222
Refers to the [=margin box=] or [=margin edge=].
223223
(In an SVG context, treated as ''<box>/stroke-box''.)
224224

225-
<dt><dfn>fill-box</dfn>
225+
<dt><dfn dfn-for="<box>,<geometry-box>,<paint-box>,<coord-box>">fill-box</dfn>
226226
<dd>
227227
Refers to the [=object bounding box=] or its edges.
228228
(In a CSS box context, treated as ''<box>/content-box''.)
229229

230-
<dt><dfn>stroke-box</dfn>
230+
<dt><dfn dfn-for="<box>,<geometry-box>,<paint-box>,<coord-box>">stroke-box</dfn>
231231
<dd>
232232
Refers to the [=stroke bounding box=] or its edges.
233233
(In a CSS box context, treated as ''<box>/border-box''.)
234234

235-
<dt><dfn>view-box</dfn>
235+
<dt><dfn dfn-for="<box>,<geometry-box>,<coord-box>">view-box</dfn>
236236
<dd>
237237
Refers to the nearest [=SVG viewport=]’s
238238
<dfn dfn lt="SVG viewport origin box" local-lt="origin box">origin box</dfn>,
@@ -253,9 +253,9 @@ Box-edge Keywords {#keywords}
253253
For convenience, the following value types are defined:
254254
<pre class="prod">
255255
<dfn><<visual-box>></dfn> = content-box | padding-box | border-box
256-
<dfn><<layout-box>></dfn> = content-box | padding-box | border-box | margin-box
257-
<dfn><<paint-box>></dfn> = content-box | padding-box | border-box | fill-box | stroke-box
258-
<dfn><<coord-box>></dfn> = content-box | padding-box | border-box | fill-box | stroke-box | view-box
256+
<dfn><<layout-box>></dfn> = <<visual-box>> | margin-box
257+
<dfn><<paint-box>></dfn> = <<visual-box>> | fill-box | stroke-box
258+
<dfn><<coord-box>></dfn> = <<paint-box>> | view-box
259259
</pre>
260260

261261
Margins {#margins}

css-shapes-1/Overview.bs

+2-2
Original file line numberDiff line numberDiff line change
@@ -807,12 +807,12 @@ Shapes from Box Values</h2>
807807
These edges include
808808
<a href="https://www.w3.org/TR/css3-background/#corner-shaping">border-radius curvature</a> [[!CSS3BG]]
809809
from the used border-radius values.
810-
The <<shape-box>> value extends the <<box>> value
810+
The <<shape-box>> value extends the <<visual-box>> value
811811
to include ''margin-box''.
812812
Its syntax is:
813813

814814
<pre class="prod">
815-
<dfn><<shape-box>></dfn> = <<box>> | ''margin-box''
815+
<dfn><<shape-box>></dfn> = <<visual-box>> | ''margin-box''
816816
</pre>
817817

818818
The definitions of the values are:

0 commit comments

Comments
 (0)