Skip to content

Commit 5c15a11

Browse files
committed
[css-images-3] Make 'objects' a local-only definition, and then actually *use* it a bunch.
1 parent fd4cc6c commit 5c15a11

1 file changed

Lines changed: 25 additions & 25 deletions

File tree

css-images-3/Overview.bs

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1015,7 +1015,7 @@ Sizing Images and Objects in CSS {#sizing}
10151015
As well, a document may contain many other types of objects,
10161016
such as video, plugins, or nested documents.
10171017
These images and objects
1018-
(just <dfn>objects</dfn> hereafter)
1018+
(just <dfn noexport lt local-lt=object>objects</dfn> hereafter)
10191019
may offer many types of sizing information to CSS,
10201020
or none at all.
10211021
This section defines generically the size negotiation model between the object and the CSS layout algorithms.
@@ -1036,25 +1036,25 @@ Object-Sizing Terminology {#sizing-terms}
10361036
<dfn>intrinsic width</dfn>,
10371037
and <dfn>intrinsic aspect ratio</dfn>
10381038
(the ratio between the width and height),
1039-
each of which may or may not exist for a given object.
1039+
each of which may or may not exist for a given [=object=].
10401040
These intrinsic dimensions represent a preferred or natural size of the object itself;
10411041
that is, they are not a function of the context in which the object is used.
10421042
CSS does not define how the intrinsic dimensions are found in general.
10431043

1044-
Raster images are an example of an object with all three intrinsic dimensions.
1044+
Raster images are an example of an [=object=] with all three intrinsic dimensions.
10451045
SVG images designed to scale might have only an <a>intrinsic aspect ratio</a>;
10461046
SVG images can also be created with only an <a>intrinsic width</a> or <a lt="intrinsic height">height</a>.
10471047
CSS gradients, defined in this specification, are an example of an object with no intrinsic dimensions at all.
10481048
Another example of this is embedded documents,
10491049
such as the <{iframe}> element in HTML.
1050-
In general, images cannot have only two intrinsic dimensions,
1050+
In general, [=objects=] cannot have only two intrinsic dimensions,
10511051
as any two automatically define the third.
10521052
However some types of replaced elements,
10531053
such as form controls,
10541054
can have an <a>intrinsic width</a> and an <a>intrinsic height</a>,
10551055
but no <a>intrinsic aspect ratio</a>.
10561056

1057-
If an object (such as an icon) has multiple sizes,
1057+
If an [=object=] (such as an icon) has multiple sizes,
10581058
then the largest size (by area) is taken as its intrinsic size.
10591059
If it has multiple aspect ratios at that size,
10601060
or has multiple aspect ratios and no size,
@@ -1066,7 +1066,7 @@ Object-Sizing Terminology {#sizing-terms}
10661066

10671067
<dt><dfn>specified size</dfn>
10681068
<dd>
1069-
The specified size of an object is given by CSS,
1069+
The specified size of an [=object=] is given by CSS,
10701070
such as through the 'width' and 'height' or 'background-size' properties.
10711071
The specified size can be a definite width and height,
10721072
a set of constraints,
@@ -1075,7 +1075,7 @@ Object-Sizing Terminology {#sizing-terms}
10751075
<dt><dfn>concrete object size</dfn>
10761076
<dd>
10771077
The <a>concrete object size</a> is the result of combining
1078-
an object's <a>intrinsic dimensions</a> and <a>specified size</a>
1078+
an [=object’s=] <a>intrinsic dimensions</a> and <a>specified size</a>
10791079
with the <a>default object size</a> of the context it's used in,
10801080
producing a rectangle with a definite width and height.
10811081

@@ -1091,45 +1091,45 @@ Object-Sizing Terminology {#sizing-terms}
10911091
CSS⇋Object Negotiation {#object-negotiation}
10921092
--------------------------------------------
10931093

1094-
Objects in CSS are sized and rendered by the <dfn export>object size negotiation</dfn> algorithm as follows:
1094+
[=Objects=] in CSS are sized and rendered by the <dfn export>object size negotiation</dfn> algorithm as follows:
10951095

1096-
1. When an image or object is specified in a document,
1096+
1. When an [=object=] is specified in a document,
10971097
such as through a ''url()'' value in a 'background-image' property
10981098
or a <{img/src}> attribute on an <{img}> element,
10991099
CSS queries the object for its <a>intrinsic dimensions</a>.
11001100

11011101
2. Using the <a>intrinsic dimensions</a>,
11021102
the <a>specified size</a>,
1103-
and the <a>default object size</a> for the context the image or object is used in,
1103+
and the <a>default object size</a> for the context the [=object=] is used in,
11041104
CSS then computes a <a>concrete object size</a>.
11051105
(See the <a section href="#default-sizing">following section</a>.)
1106-
This defines the size and position of the region the object will render in.
1106+
This defines the size and position of the region the [=object=] will render in.
11071107

1108-
3. CSS asks the object to render itself at the <a>concrete object size</a>.
1109-
CSS does not define how objects render when the <a>concrete object size</a> is different from the object's <a>intrinsic dimensions</a>.
1110-
The object may adjust itself to match the <a>concrete object size</a> in some way,
1108+
3. CSS asks the [=object=] to render itself at the <a>concrete object size</a>.
1109+
CSS does not define how [=objects=] render when the <a>concrete object size</a> is different from the [=object’s=] <a>intrinsic dimensions</a>.
1110+
The [=object=] may adjust itself to match the <a>concrete object size</a> in some way,
11111111
or even render itself larger or smaller than the <a>concrete object size</a> to satisfy sizing constraints of its own.
11121112

11131113
4. Unless otherwise specified by CSS,
1114-
the object is then clipped to the <a>concrete object size</a>.
1114+
the [=object=] is then clipped to the <a>concrete object size</a>.
11151115

11161116

11171117
Concrete Object Size Resolution {#concrete-size-resolution}
11181118
-----------------------------------------------------------
11191119

1120-
Currently the rules for sizing objects are described in each context that such objects are used.
1120+
Currently the rules for sizing [=objects=] are described in each context that such [=objects=] are used.
11211121
This section defines some common sizing constraints
11221122
and how to resolve them
11231123
so that future specs can refer to them instead of redefining size resolution in each instance.
11241124

11251125
### Default Sizing Algorithm ### {#default-sizing}
11261126

1127-
The <dfn export>default sizing algorithm</dfn> is a set of rules commonly used to find an object's <a>concrete object size</a>.
1128-
It resolves the simultaneous constraints presented by the object's <a>intrinsic dimensions</a>
1127+
The <dfn export>default sizing algorithm</dfn> is a set of rules commonly used to find an [=object’s=] <a>concrete object size</a>.
1128+
It resolves the simultaneous constraints presented by the [=object’s=] <a>intrinsic dimensions</a>
11291129
and either an unconstrained <a>specified size</a>
11301130
or one consisting of only a definite width and/or height.
11311131

1132-
Some object sizing rules
1132+
Some [=object=] sizing rules
11331133
(such as those for 'list-style-image')
11341134
correspond exactly to the <a>default sizing algorithm</a>.
11351135
Others
@@ -1146,18 +1146,18 @@ Concrete Object Size Resolution {#concrete-size-resolution}
11461146
then the <a>concrete object size</a> is given that specified width or height.
11471147
The other dimension is calculated as follows:
11481148

1149-
1. If the object has an <a>intrinsic aspect ratio</a>,
1149+
1. If the [=object=] has an <a>intrinsic aspect ratio</a>,
11501150
the missing dimension of the <a>concrete object size</a>
11511151
is calculated using the <a>intrinsic aspect ratio</a> and the present dimension.
11521152

11531153
2. Otherwise, if the missing dimension is present in the object's <a>intrinsic dimensions</a>,
1154-
the missing dimension is taken from the object's <a>intrinsic dimensions</a>.
1154+
the missing dimension is taken from the [=object’s=] <a>intrinsic dimensions</a>.
11551155

11561156
3. Otherwise, the missing dimension of the <a>concrete object size</a> is taken from the <a>default object size</a>.
11571157

11581158
* If the <a>specified size</a> has no constraints:
11591159

1160-
1. If the object has an intrinsic height or width,
1160+
1. If the [=object=] has an intrinsic height or width,
11611161
its size is resolved as if its <a>intrinsic dimensions</a> were given as the <a>specified size</a>.
11621162

11631163
2. Otherwise, its size is resolved as a <a>contain constraint</a> against the <a>default object size</a>.
@@ -1166,14 +1166,14 @@ Concrete Object Size Resolution {#concrete-size-resolution}
11661166

11671167
Two other common specified sizes are the <a>contain constraint</a> and the <a>cover constraint</a>,
11681168
both of which are resolved against a specified <dfn export>constraint rectangle</dfn>
1169-
using the object's <a>intrinsic aspect ratio</a>:
1169+
using the [=object’s=] <a>intrinsic aspect ratio</a>:
11701170

11711171
* A <dfn export>contain constraint</dfn> is resolved
1172-
by setting the <a>concrete object size</a> to the largest rectangle that has the object's <a>intrinsic aspect ratio</a>
1172+
by setting the <a>concrete object size</a> to the largest rectangle that has the [=object’s=] <a>intrinsic aspect ratio</a>
11731173
and additionally has neither width nor height larger than the constraint rectangle's width and height, respectively.
11741174

11751175
* A <dfn export>cover constraint</dfn> is resolved
1176-
by setting the <a>concrete object size</a> to the smallest rectangle that has the object's <a>intrinsic aspect ratio</a>
1176+
by setting the <a>concrete object size</a> to the smallest rectangle that has the [=object’s=] <a>intrinsic aspect ratio</a>
11771177
and additionally has neither width nor height smaller than the constraint rectangle's width and height, respectively.
11781178

11791179
In both cases,

0 commit comments

Comments
 (0)