Skip to content

Commit ffdb80f

Browse files
committed
Markup tweak.
--HG-- extra : rebase_source : ed562fb054a43f9fff934ce8c050986432ecc70a
1 parent 2baea81 commit ffdb80f

2 files changed

Lines changed: 12 additions & 39 deletions

File tree

css3-images/Overview.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2025,7 +2025,7 @@ <h3 id=default-sizing><span class=secno>5.3. </span> Default Concrete
20252025
example, the &lsquo;<code class=property>min-width</code>&rsquo;,
20262026
&lsquo;<code class=property>min-height</code>&rsquo;, &lsquo;<code
20272027
class=property>max-width</code>&rsquo;, and &lsquo;<code
2028-
class=property>max-height</code>&rsquo; properties specify slightly more
2028+
class=property>max-height</code>&rsquo;properties specify slightly more
20292029
complex handling for sizing replaced elements, and &lsquo;<code
20302030
class=css>background-repeat: round</code>&rsquo; can further adjust the
20312031
size calculated by &lsquo;<code

css3-images/Overview.src.html

Lines changed: 11 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1148,60 +1148,33 @@ <h3 id="object-negotiation">
11481148
<h3 id="default-sizing">
11491149
Default Concrete Object Size Resolution</h3>
11501150

1151-
<p>In the absence of more specific rules, an object's
1152-
<i>intrinsic dimensions</i> are resolved to a <i>concrete object size</i> as
1153-
follows:</p>
1151+
<p>In the absence of more specific rules, an object's <i>intrinsic dimensions</i> are resolved to a <i>concrete object size</i> as follows:</p>
11541152

11551153
<ul>
1156-
<li>If the <i>specified size</i> is a definite width and height, the
1157-
<i>concrete object size</i> is given that width and height.</li>
1154+
<li>If the <i>specified size</i> is a definite width and height, the <i>concrete object size</i> is given that width and height.</li>
11581155

1159-
<li>If the <i>specified size</i> has only a width or height, but not both,
1160-
then the <i>concrete object size</i> is given that specified width or height.
1161-
The other dimension is calculated as follows:
1156+
<li>If the <i>specified size</i> has only a width or height, but not both, then the <i>concrete object size</i> is given that specified width or height. The other dimension is calculated as follows:
11621157

11631158
<ol>
1164-
<li>If the object has an <i>intrinsic aspect ratio</i>, the missing
1165-
dimension of the <i>concrete object size</i> is calculated using the
1166-
<i>intrinsic aspect-ratio</i> and the present dimension.</li>
1159+
<li>If the object has an <i>intrinsic aspect ratio</i>, the missing dimension of the <i>concrete object size</i> is calculated using the <i>intrinsic aspect-ratio</i> and the present dimension.</li>
11671160

1168-
<li>Otherwise, if the missing dimension is present in the object's
1169-
<i>intrinsic dimensions</i>, the missing dimension is taken from the
1170-
object's <i>intrinsic dimensions</i>.</li>
1161+
<li>Otherwise, if the missing dimension is present in the object's <i>intrinsic dimensions</i>, the missing dimension is taken from the object's <i>intrinsic dimensions</i>.</li>
11711162

1172-
<li>Otherwise, the missing dimension of the <i>concrete object size</i>
1173-
is taken from the <i>default object size</i>.</li>
1163+
<li>Otherwise, the missing dimension of the <i>concrete object size</i> is taken from the <i>default object size</i>.</li>
11741164
</ol>
11751165
</li>
11761166

1177-
<li>If the <i>specified size</i> has neither a definite width nor height, and
1178-
has no additional contraints, the dimensions of the <i>concrete object size</i>
1179-
are calculated as follows:
1167+
<li>If the <i>specified size</i> has neither a definite width nor height, and has no additional contraints, the dimensions of the <i>concrete object size</i> are calculated as follows:
11801168

11811169
<ol>
1182-
<li>If the object has only an <i>intrinsic aspect ratio</i>, the
1183-
<i>concrete object size</i> must have that aspect ratio, and additionally
1184-
be as large as possible without either its height or width exceeding
1185-
the height or width of the <i>default object size</i>. Otherwise,
1186-
the width and height of the <i>concrete object size</i> is the same
1187-
as the object's <i>intrinsic width</i> and <i>intrinsic height</i>,
1188-
if they exist.</li>
1189-
1190-
<li>If the <i>concrete object size</i> is still missing a width or height,
1191-
and the object has an <i>intrinsic aspect ratio</i>, the missing dimension
1192-
is calculated from the present dimension and the <i>intrinsic aspect ratio</i>.
1193-
Otherwise, each missing dimension is taken from the <i>default object size</i>.</li>
1170+
<li>If the object has only an <i>intrinsic aspect ratio</i>, the <i>concrete object size</i> must have that aspect ratio, and additionally be as large as possible without either its height or width exceeding the height or width of the <i>default object size</i>. Otherwise, the width and height of the <i>concrete object size</i> is the same as the object's <i>intrinsic width</i> and <i>intrinsic height</i>, if they exist.</li>
1171+
1172+
<li>If the <i>concrete object size</i> is still missing a width or height, and the object has an <i>intrinsic aspect ratio</i>, the missing dimension is calculated from the present dimension and the <i>intrinsic aspect ratio</i>. Otherwise, each missing dimension is taken from the <i>default object size</i>.</li>
11941173
</ol>
11951174
</li>
11961175
</ul>
11971176

1198-
<p>If the <i>specified size</i> has additional constraints, the
1199-
<i>concrete object size</i> must be sized to satisfy those constraints.
1200-
For example, the 'min-width', 'min-height', 'max-width', and 'max-height'
1201-
properties specify slightly more complex handling for sizing replaced
1202-
elements, and ''background-repeat: round'' can further adjust
1203-
the size calculated by 'background-size' so that the image fits a whole
1204-
number of times into the background positioning area.</p>
1177+
<p>If the <i>specified size</i> has additional constraints, the <i>concrete object size</i> must be sized to satisfy those constraints. For example, the 'min-width', 'min-height', 'max-width', and 'max-height'properties specify slightly more complex handling for sizing replaced elements, and ''background-repeat: round'' can further adjust the size calculated by 'background-size' so that the image fits a whole number of times into the background positioning area.</p>
12051178

12061179
<!-- ====================================================================== -->
12071180

0 commit comments

Comments
 (0)