Skip to content

Commit dd61090

Browse files
committed
Reword the intrinsic dimensions paragraph per dbaron's suggestions.
--HG-- extra : rebase_source : de8ee2f02b1f7113a3ce7dfb36a1f61149311d88
1 parent 82e9595 commit dd61090

2 files changed

Lines changed: 31 additions & 56 deletions

File tree

css3-images/Overview.html

Lines changed: 28 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -1825,19 +1825,17 @@ <h3 id=sizing-terms><span class=secno>5.1. </span> Object-Sizing
18251825
<dt><dfn id=intrinsic-dimensions>intrinsic dimensions</dfn>
18261826

18271827
<dd>
1828-
<p>An object's intrinsic dimensions are its preferred, natural width,
1829-
height, and aspect ratio, if they exist. There can be an <dfn
1830-
id=intrinsic-height>intrinsic height</dfn> and <dfn
1831-
id=intrinsic-width>intrinsic width</dfn>, defining a definite rectangle
1832-
and an <a href="#intrinsic-aspect-ratio"><i>intrinsic aspect
1833-
ratio</i></a>. (Most bitmap images fall into this category.) There can
1834-
be only an <dfn id=intrinsic-aspect-ratio>intrinsic aspect ratio</dfn>
1835-
defining the relation of the width to the height, but no definite size.
1836-
(SVG images designed to scale may fall into this category.) There can be
1837-
just an intrinsic height or width. Or there can be no intrinsic
1838-
dimensions at all, implying that the object has no preferred size or
1839-
aspect ratio. (Embedded documents are often assumed to have no intrinsic
1840-
size, as are CSS gradients, defined in this specification.)</p>
1828+
<p>The term intrinsic dimensions refers to the set of the intrinsic
1829+
height, intrinsic width, and intrinsic aspect ratio, each of which may
1830+
or may not exist for a given object. These intrinsic dimensions
1831+
represent a preferred or natural size of the object itself, that is,
1832+
they are not a function of the context in which the object is used.</p>
1833+
1834+
<p>An object may have no intrinsic dimensions (such as CSS gradients),
1835+
only one intrinsic dimension (SVG images designed to scale may have only
1836+
an aspect ratio), or all three intrinsic dimensions (all raster images,
1837+
for example). <span class=note>(Note: an object cannot have only two
1838+
intrinsic dimensions, as any two automatically define the third.)</span></p>
18411839

18421840
<p>If an object (such as an icon) has multiple sizes, then the largest
18431841
size is taken as its intrinsic size. If it has multiple aspect ratios at
@@ -1985,11 +1983,10 @@ <h3 id=default-sizing><span class=secno>5.3. </span> Default Concrete
19851983
that specified width or height. The other dimension is calculated as
19861984
follows:
19871985
<ol>
1988-
<li>If the object has an <a href="#intrinsic-aspect-ratio"><i>intrinsic
1989-
aspect ratio</i></a>, the missing dimension of the <a
1990-
href="#concrete-object-size"><i>concrete object size</i></a> is
1991-
calculated using the <i>intrinsic aspect-ratio</i> and the present
1992-
dimension.
1986+
<li>If the object has an <i>intrinsic aspect ratio</i>, the missing
1987+
dimension of the <a href="#concrete-object-size"><i>concrete object
1988+
size</i></a> is calculated using the <i>intrinsic aspect-ratio</i> and
1989+
the present dimension.
19931990

19941991
<li>Otherwise, if the missing dimension is present in the object's <a
19951992
href="#intrinsic-dimensions"><i>intrinsic dimensions</i></a>, the
@@ -2006,24 +2003,20 @@ <h3 id=default-sizing><span class=secno>5.3. </span> Default Concrete
20062003
dimensions of the <a href="#concrete-object-size"><i>concrete object
20072004
size</i></a> are calculated as follows:
20082005
<ol>
2009-
<li>If the object has only an <a
2010-
href="#intrinsic-aspect-ratio"><i>intrinsic aspect ratio</i></a>, the
2011-
<a href="#concrete-object-size"><i>concrete object size</i></a> must
2012-
have that aspect ratio, and additionally be as large as possible
2013-
without either its height or width exceeding the height or width of the
2014-
<a href="#default-object-size"><i>default object size</i></a>.
2015-
Otherwise, the width and height of the <a
2016-
href="#concrete-object-size"><i>concrete object size</i></a> is the
2017-
same as the object's <a href="#intrinsic-width"><i>intrinsic
2018-
width</i></a> and <a href="#intrinsic-height"><i>intrinsic
2019-
height</i></a>, if they exist.
2006+
<li>If the object has only an <i>intrinsic aspect ratio</i>, the <a
2007+
href="#concrete-object-size"><i>concrete object size</i></a> must have
2008+
that aspect ratio, and additionally be as large as possible without
2009+
either its height or width exceeding the height or width of the <a
2010+
href="#default-object-size"><i>default object size</i></a>. Otherwise,
2011+
the width and height of the <a href="#concrete-object-size"><i>concrete
2012+
object size</i></a> is the same as the object's <i>intrinsic width</i>
2013+
and <i>intrinsic height</i>, if they exist.
20202014

20212015
<li>If the <a href="#concrete-object-size"><i>concrete object
20222016
size</i></a> is still missing a width or height, and the object has an
2023-
<a href="#intrinsic-aspect-ratio"><i>intrinsic aspect ratio</i></a>,
2024-
the missing dimension is calculated from the present dimension and the
2025-
<a href="#intrinsic-aspect-ratio"><i>intrinsic aspect ratio</i></a>.
2026-
Otherwise, each missing dimension is taken from the <a
2017+
<i>intrinsic aspect ratio</i>, the missing dimension is calculated from
2018+
the present dimension and the <i>intrinsic aspect ratio</i>. Otherwise,
2019+
each missing dimension is taken from the <a
20272020
href="#default-object-size"><i>default object size</i></a>.
20282021
</ol>
20292022
</ul>
@@ -2099,9 +2092,8 @@ <h3 id=object-fit><span class=secno>5.4. </span> Sizing Objects: the
20992092

21002093
<p>Not all replaced elements can be scaled, but images typically can.
21012094

2102-
<p>If the replaced element's content does not have an <a
2103-
href="#intrinsic-aspect-ratio"><i>intrinsic aspect ratio</i></a>, all of
2104-
the values for &lsquo;<a href="#object-fit0"><code
2095+
<p>If the replaced element's content does not have an <i>intrinsic aspect
2096+
ratio</i>, all of the values for &lsquo;<a href="#object-fit0"><code
21052097
class=property>object-fit</code></a>&rsquo; are treated as &lsquo;<code
21062098
class=css>fill</code>&rsquo;. Otherwise, the object is scaled as follows:
21072099

@@ -2980,21 +2972,12 @@ <h2 class=no-num id=index>Index</h2>
29802972
<li>image-resolution, <a href="#image-resolution0"
29812973
title=image-resolution><strong>6.1.</strong></a>
29822974

2983-
<li>intrinsic aspect ratio, <a href="#intrinsic-aspect-ratio"
2984-
title="intrinsic aspect ratio"><strong>5.1.</strong></a>
2985-
29862975
<li>intrinsic dimensions, <a href="#intrinsic-dimensions"
29872976
title="intrinsic dimensions"><strong>5.1.</strong></a>
29882977

2989-
<li>intrinsic height, <a href="#intrinsic-height"
2990-
title="intrinsic height"><strong>5.1.</strong></a>
2991-
29922978
<li>intrinsic resolution, <a href="#intrinsic-resolution"
29932979
title="intrinsic resolution"><strong>6.1.</strong></a>
29942980

2995-
<li>intrinsic width, <a href="#intrinsic-width"
2996-
title="intrinsic width"><strong>5.1.</strong></a>
2997-
29982981
<li>invalid image, <a href="#invalid-image"
29992982
title="invalid image"><strong>3.</strong></a>
30002983

css3-images/Overview.src.html

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1065,17 +1065,9 @@ <h3 id="sizing-terms">
10651065
<dl>
10661066
<dt><dfn>intrinsic dimensions</dfn></dt>
10671067
<dd>
1068-
<p>An object's intrinsic dimensions are its preferred, natural width,
1069-
height, and aspect ratio, if they exist. There can be an <dfn>intrinsic height</dfn>
1070-
and <dfn>intrinsic width</dfn>, defining a definite rectangle and an
1071-
<i>intrinsic aspect ratio</i>. (Most bitmap images fall into this category.)
1072-
There can be only an <dfn>intrinsic aspect ratio</dfn> defining the
1073-
relation of the width to the height, but no definite size.
1074-
(SVG images designed to scale may fall into this category.) There can be
1075-
just an intrinsic height or width. Or there can be no intrinsic dimensions
1076-
at all, implying that the object has no preferred size or aspect ratio.
1077-
(Embedded documents are often assumed to have no intrinsic size, as are
1078-
CSS gradients, defined in this specification.)</p>
1068+
<p>The term intrinsic dimensions refers to the set of the intrinsic height, intrinsic width, and intrinsic aspect ratio, each of which may or may not exist for a given object. These intrinsic dimensions represent a preferred or natural size of the object itself, that is, they are not a function of the context in which the object is used.</p>
1069+
1070+
<p>An object may have no intrinsic dimensions (such as CSS gradients), only one intrinsic dimension (SVG images designed to scale may have only an aspect ratio), or all three intrinsic dimensions (all raster images, for example). <span class='note'>(Note: an object cannot have only two intrinsic dimensions, as any two automatically define the third.)</span></p>
10791071

10801072
<p>If an object (such as an icon) has multiple sizes, then the largest
10811073
size is taken as its intrinsic size. If it has multiple aspect ratios

0 commit comments

Comments
 (0)