Editorial tweaking.

Author: tabatkins

css3-images/Overview.html

@@ -15,7 +15,7 @@
 
    <h1>CSS Image Values and Replaced Content Module Level 3</h1>
 
-   <h2 class="no-num no-toc" id=longstatus-date>Editor's Draft 7 March 2011</h2>
+   <h2 class="no-num no-toc" id=longstatus-date>Editor's Draft 13 April 2011</h2>
 
    <dl>
     <dt>Latest Version:
@@ -170,8 +170,8 @@ <h2 class="no-num no-toc" id=contents> Table of contents</h2>
      <li><a href="#object-negotiation"><span class=secno>6.2. </span>
       CSS⇋Object Negotiation</a>
 
-     <li><a href="#default-sizing"><span class=secno>6.3. </span> Default
-      Intrinsic-Size Resolution</a>
+     <li><a href="#default-sizing"><span class=secno>6.3. </span> Concrete
+      Object Size Resolution</a>
 
      <li><a href="#object-fit"><span class=secno>6.4. </span> Sizing Objects:
       The &lsquo;<code class=property>object-fit</code>&rsquo; Property</a>
@@ -1144,8 +1144,8 @@ <h3 id=sizing-terms><span class=secno>6.1. </span> Object-Sizing
    <dt><dfn id=intrinsic-dimensions>intrinsic dimensions</dfn>
 
    <dd>
-    <p>The intrinsic dimensions are defined are the object's preferred,
-     natural size or aspect ratio, if any. There can be an <dfn
+    <p>An object's intrinsic dimensions are its preferred, natural width,
+     height, and aspect ratio, if they exist. There can be an <dfn
      id=intrinsic-height>intrinsic height</dfn> and <dfn
      id=intrinsic-width>intrinsic width</dfn>, defining a definite rectangle.
      (Most bitmap images fall into this category.) There can be an <dfn
@@ -1210,10 +1210,6 @@ <h3 id=sizing-terms><span class=secno>6.1. </span> Object-Sizing
       <dd>The <a href="#default-object-size"><i>default object size</i></a>
        is a 1em square. <a href="#CSS21"
        rel=biblioentry>[CSS21]<!--{{!CSS21}}--></a>
-       <p class=issue>This doesn't reflect the CSS2.1 algorithm (they differ
-        in how they handle images with only one intrinsic dimension and no
-        ratio, due to step 3 of the CSS2.1 algo), but it does reflect
-        reality.</p>
 
       <dt>&lsquo;<code class=property>border-image</code>&rsquo;
 
@@ -1251,7 +1247,7 @@ <h3 id=object-negotiation><span class=secno>6.2. </span> CSS⇋Object
   <p>Objects in CSS are sized and rendered as follows:
 
   <ol>
-   <li>When an image or object is specified in a document, such as through
+   <li>When an image or object is specified in a document, such as through a
     url() value in a &lsquo;<code
     class=property>background-image</code>&rsquo; property or a @src
     attribute on an &lt;img> element, CSS queries the object for its <a
@@ -1261,7 +1257,8 @@ <h3 id=object-negotiation><span class=secno>6.2. </span> CSS⇋Object
     dimensions</i></a> and the <a href="#specified-size"><i>specified
     size</i></a>, CSS then computes a <a
     href="#concrete-object-size"><i>concrete object size</i></a> that defines
-    the size and position of the region the object will render in.
+    the size and position of the region the object will render in (specified
+    in the following section).
 
    <li>CSS asks the object to render itself at the <a
     href="#concrete-object-size"><i>concrete object size</i></a>. CSS does
@@ -1279,10 +1276,10 @@ <h3 id=object-negotiation><span class=secno>6.2. </span> CSS⇋Object
   </ol>
   <!-- ====================================================================== -->
 
-  <h3 id=default-sizing><span class=secno>6.3. </span> Default Intrinsic-Size
+  <h3 id=default-sizing><span class=secno>6.3. </span> Concrete Object Size
    Resolution</h3>
 
-  <p>In the absence of more specific rules to the contrary, an object's <a
+  <p>In the absence of more specific rules, an object's <a
    href="#intrinsic-dimensions"><i>intrinsic dimensions</i></a> are resolved
    to a <a href="#concrete-object-size"><i>concrete object size</i></a> as
    follows:
@@ -1306,44 +1303,38 @@ <h3 id=default-sizing><span class=secno>6.3. </span> Default Intrinsic-Size
       dimension.
 
      <li>Otherwise, if the missing dimension is present in the object's <a
-      href="#intrinsic-dimensions"><i>intrinsic dimensions</i></a>, the <a
-      href="#concrete-object-size"><i>concrete object
-      size</i></a>&lsquo;<code class=css>s missing dimension is taken from
-      the object</code>&rsquo;s <a href="#intrinsic-dimensions"><i>intrinsic
-      dimensions</i></a>.
-
-     <li>Otherwise, the missing dimension of the <i>concrete objecty size</i>
-      is taken from the <a href="#default-object-size"><i>default object
-      size</i></a>.
+      href="#intrinsic-dimensions"><i>intrinsic dimensions</i></a>, the
+      missing dimension is taken from the object's <a
+      href="#intrinsic-dimensions"><i>intrinsic dimensions</i></a>.
+
+     <li>Otherwise, the missing dimension of the <a
+      href="#concrete-object-size"><i>concrete object size</i></a> is taken
+      from the <a href="#default-object-size"><i>default object size</i></a>.
     </ol>
 
    <li>If the <a href="#specified-size"><i>specified size</i></a> has neither
     a definite width nor height, and has no additional contraints, the
     dimensions of the <a href="#concrete-object-size"><i>concrete object
     size</i></a> are calculated as follows:
     <ol>
-     <li>If the object has both an <a href="#intrinsic-width"><i>intrinsic
-      width</i></a> and an <a href="#intrinsic-height"><i>intrinsic
-      height</i></a>, the <a href="#concrete-object-size"><i>concrete object
-      size</i></a> is given that same height and width.
-
-     <li>If the object has only an <a href="#intrinsic-width"><i>intrinsic
-      width</i></a> or <a href="#intrinsic-height"><i>intrinsic
-      height</i></a>, and no <a href="#intrinsic-aspect-ratio"><i>intrinsic
-      aspect ratio</i></a>, the <a href="#concrete-object-size"><i>concrete
-      object size</i></a> is given that width or height, and missing
-      dimension is taken from the <a href="#default-object-size"><i>default
-      object size</i></a>.
-
      <li>If the object has only an <a
       href="#intrinsic-aspect-ratio"><i>intrinsic aspect ratio</i></a>, the
       <a href="#concrete-object-size"><i>concrete object size</i></a> 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
       <a href="#default-object-size"><i>default object size</i></a>.
-
-     <li>Otherwise, the <a href="#concrete-object-size"><i>concrete object
-      size</i></a> is the same as the <a
+      Otherwise, the width and height of the <a
+      href="#concrete-object-size"><i>concrete object size</i></a> is the
+      same as the object's <a href="#intrinsic-width"><i>intrinsic
+      width</i></a> and <a href="#intrinsic-height"><i>intrinsic
+      height</i></a>, if they exist.
+
+     <li>If the <a href="#concrete-object-size"><i>concrete object
+      size</i></a> is still missing a width or height, and the object has an
+      <a href="#intrinsic-aspect-ratio"><i>intrinsic aspect ratio</i></a>,
+      the missing dimension is calculated from the present dimension and the
+      <a href="#intrinsic-aspect-ratio"><i>intrinsic aspect ratio</i></a>.
+      Otherwise, the missing dimensions is taken from the <a
       href="#default-object-size"><i>default object size</i></a>.
     </ol>
   </ul>
@@ -1742,7 +1733,7 @@ <h2 id=image-orientation><span class=secno>8. </span> Orienting an Image on
     <tr>
      <th>Inherited:
 
-     <td>N/A
+     <td>no
 
     <tr>
      <th>Media:
@@ -1820,7 +1811,7 @@ <h2 id=image-rendering><span class=secno>9. </span> Determining How to
     <tr>
      <th>Inherited:
 
-     <td>Yes
+     <td>yes
 
     <tr>
      <th>Media:

css3-images/Overview.src.html

@@ -859,8 +859,8 @@ <h3 id="sizing-terms">
 	<dl>
 		<dt><dfn>intrinsic dimensions</dfn></dt>
 		<dd>
-			<p>The intrinsic dimensions are defined are the object's preferred, natural 
-			size or aspect ratio, if any. There can be an <dfn>intrinsic height</dfn> 
+			<p>An object's intrinsic dimensions are its preferred, natural width,
+			height, and aspect ratio, if they exist. There can be an <dfn>intrinsic height</dfn> 
 			and <dfn>intrinsic width</dfn>, defining a definite rectangle. (Most bitmap 
 			images fall into this category.) There can be an <dfn>intrinsic aspect ratio</dfn> 
 			defining the relation of the width to the height, but no definite size. 
@@ -905,12 +905,7 @@ <h3 id="sizing-terms">
 					positioning area</a>. [[CSS3BG]]</dd>
 
 					<dt>'list-style-image'</dt>
-					<dd>The <i>default object size</i> is a 1em square. [[!CSS21]]
-						<p class=issue>This doesn't reflect the CSS2.1 algorithm (they
-						differ in how they handle images with only one intrinsic dimension
-						and no ratio, due to step 3 of the CSS2.1 algo), but it does
-						reflect reality.</p>
-					</dd>
+					<dd>The <i>default object size</i> is a 1em square. [[!CSS21]]</dd>
 
 					<dt>'border-image'</dt>
 					<dd>The <i>default object size</i> is the size of the element's
@@ -942,13 +937,14 @@ <h3 id="object-negotiation">
 	<p>Objects in CSS are sized and rendered as follows:</p>
 
 	<ol>
-		<li>When an image or object is specified in a document, such as through url() 
+		<li>When an image or object is specified in a document, such as through a url() 
 		value in a 'background-image' property or a @src attribute on an &lt;img> element, 
 		CSS queries the object for its <i>intrinsic dimensions</i>.</li>
 
 		<li>Using the <i>intrinsic dimensions</i> and the <i>specified size</i>, 
 		CSS then computes a <i>concrete object size</i> that defines the size and 
-		position of the region the object will render in.</li>
+		position of the region the object will render in (specified in the 
+		following section).</li>
 
 		<li>CSS asks the object to render itself at the <i>concrete object size</i>.  
 		CSS does not define how objects render when the <i>concrete object size</i> 
@@ -958,15 +954,15 @@ <h3 id="object-negotiation">
 		satisfy sizing constraints of its own.</li>
 
 		<li>Unless otherwise specified by CSS, the object is then clipped to the
-		<i>concrete object size</i>.
+		<i>concrete object size</i>.</li>
 	</ol>
 
 <!-- ====================================================================== -->
 
 <h3 id="default-sizing">
-Default Intrinsic-Size Resolution</h3>
+Concrete Object Size Resolution</h3>
 
-	<p>In the absence of more specific rules to the contrary, an object's
+	<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>
 
@@ -984,10 +980,10 @@ <h3 id="default-sizing">
 				<i>intrinsic aspect-ratio</i> and the present dimension.</li>
 
 				<li>Otherwise, if the missing dimension is present in the object's
-				<i>intrinsic dimensions</i>, the <i>concrete object size</i>'s missing
-				dimension is taken from the object's <i>intrinsic dimensions</i>.</li>
+				<i>intrinsic dimensions</i>, the missing dimension is taken from the
+				object's <i>intrinsic dimensions</i>.</li>
 
-				<li>Otherwise, the missing dimension of the <i>concrete objecty size</i>
+				<li>Otherwise, the missing dimension of the <i>concrete object size</i>
 				is taken from the <i>default object size</i>.</li>
 			</ol>
 		</li>
@@ -997,22 +993,18 @@ <h3 id="default-sizing">
 		are calculated as follows:
 
 			<ol>
-				<li>If the object has both an <i>intrinsic width</i> and an
-				<i>intrinsic height</i>, the <i>concrete object size</i> is given that
-				same height and width.</li>
-
-				<li>If the object has only an <i>intrinsic width</i> or
-				<i>intrinsic height</i>, and no <i>intrinsic aspect ratio</i>,
-				the <i>concrete object size</i> is given that width or height, and
-				missing dimension is taken from the <i>default object size</i>.</li>
-
 				<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>.</li>
-
-				<li>Otherwise, the <i>concrete object size</i> is the same as the
-				<i>default object size</i>.</li>
+				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>
+
+				<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, the missing dimensions is taken from the <i>default object size</i>.</li>
 			</ol>
 		</li>
 	</ul>