Preparing draft for WD publication, so removing some recently-added values in object-fit.

Author: tabatkins

css3-images/Overview.html

@@ -1633,7 +1633,7 @@ <h3 id=object-fit><span class=secno>6.4. </span>Sizing Replaced Elements:
       <tr>
        <th>Value:
 
-       <td>fill | contain | cover | none | scale-down
+       <td>fill | contain | cover
 
       <tr>
        <th>Initial:
@@ -1731,23 +1731,21 @@ <h3 id=object-fit><span class=secno>6.4. </span>Sizing Replaced Elements:
        the smallest size such that the width of the contents is greater than
        or equal to the used width of the box and the height of the contents
        is greater than or equal to the height of the box.</p>
-
-     <dt>none
-
-     <dd>
-      <p>Determine the used &lsquo;<code class=property>height</code>&rsquo;
-       and &lsquo;<code class=property>width</code>&rsquo; <a
-       href="/TR/CSS21/visudet.html">as usual</a>. If the content has an
-       intrinsic height and width, do not scale it. Otherwise, this value
-       must be treated as &lsquo;<code class=css>fill</code>&rsquo;.</p>
-
-     <dt>scale-down <b class=issue>better name?</b>
-
-     <dd>
-      <p>This value must act identically to &lsquo;<code
-       class=css>none</code>&rsquo; or &lsquo;<code
-       class=css>contain</code>&rsquo;, whichever would make the contents
-       smaller.</p>
+     </dd>
+     <!-- Commented out for WD publication
+			<dt>none</dt>
+			<dd>
+				<p>Determine the used &lsquo;<code class=property>height</code>&rsquo; and &lsquo;<code class=property>width</code>&rsquo; <a href="/TR/CSS21/visudet.html">as
+				usual</a>.  If the content has an intrinsic height and width, do not
+				scale it.  Otherwise, this value must be treated as &lsquo;<code class=css>fill</code>&rsquo;.</p>
+			</dd>
+
+			<dt>scale-down <b class=issue>better name?</b></dt>
+			<dd>
+				<p>This value must act identically to &lsquo;<code class=css>none</code>&rsquo; or &lsquo;<code class=css>contain</code>&rsquo;, whichever 
+				would make the contents smaller.</p>
+			</dd>
+-->
     </dl>
 
     <p>The &lsquo;<code class=property>overflow</code>&rsquo; property
@@ -1775,6 +1773,13 @@ <h3 id=object-fit><span class=secno>6.4. </span>Sizing Replaced Elements:
      class=property>object-fit</code></a>&rsquo; property has similar
      semantics to the fit attribute in <a href="#SMIL10"
      rel=biblioentry>[SMIL10]<!--{{SMIL10}}--></a>.</p>
+
+    <p>User agents MAY accept &lsquo;<code
+     class=property>image-fit</code>&rsquo; as an alias for &lsquo;<a
+     href="#object-fit0"><code class=property>object-fit</code></a>&rsquo;,
+     as a previous version of this specification used that name. Authors must
+     not use &lsquo;<code class=property>image-fit</code>&rsquo; in their
+     stylesheets.</p>
    </div>
 
    <div>
@@ -1838,6 +1843,13 @@ <h3 id=object-position><span class=secno>6.5. </span>Positioning Replaced
 
     <p class=note>Note that areas of the box not covered by the replaced
      element will show the element's background.</p>
+
+    <p>User agents MAY accept &lsquo;<code
+     class=property>image-position</code>&rsquo; as an alias for &lsquo;<a
+     href="#object-position0"><code
+     class=property>object-position</code></a>&rsquo;, as a previous version
+     of this specification used that name. Authors must not use &lsquo;<code
+     class=property>image-position</code>&rsquo; in their stylesheets.</p>
    </div>
   </div>
 

css3-images/Overview.src.html

@@ -1165,7 +1165,7 @@ <h3 id="object-fit">Sizing Replaced Elements: The 'object-fit' Property</h3>
 				<td><dfn>object-fit</dfn>
 			<tr>
 				<th>Value:
-				<td>fill | contain | cover | none | scale-down
+				<td>fill | contain | cover
 			<tr>
 				<th>Initial:
 				<td>fill
@@ -1225,6 +1225,7 @@ <h3 id="object-fit">Sizing Replaced Elements: The 'object-fit' Property</h3>
 				usual</a>, except if both 'height' and 'width' are ''auto'', and the used value
 				of at least one of 'min-width' and 'min-height' is not ''0'', then compute the
 
+
 				used width and used height of the element as though the intrinsic dimensions of
 				the contents were infinitesimally small numbers whose ratio is the actual
 				intrinsic ratio of the contents.</p>
@@ -1233,7 +1234,7 @@ <h3 id="object-fit">Sizing Replaced Elements: The 'object-fit' Property</h3>
 				the used width of the box and the height of the contents is greater than or
 				equal to the height of the box.</p>
 			</dd>
-
+<!-- Commented out for WD publication
 			<dt>none</dt>
 			<dd>
 				<p>Determine the used 'height' and 'width' <a href="/TR/CSS21/visudet.html">as
@@ -1246,6 +1247,7 @@ <h3 id="object-fit">Sizing Replaced Elements: The 'object-fit' Property</h3>
 				<p>This value must act identically to ''none'' or ''contain'', whichever 
 				would make the contents smaller.</p>
 			</dd>
+-->
 		</dl>
 
 		<p>The 'overflow' property determines how to render parts of the replaced
@@ -1265,6 +1267,10 @@ <h3 id="object-fit">Sizing Replaced Elements: The 'object-fit' Property</h3>
 
 		<p class="note">Note: the 'object-fit' property has similar semantics to
 		the fit attribute in [[SMIL10]].</p>
+
+		<p>User agents MAY accept 'image-fit' as an alias for 'object-fit', as a
+		previous version of this specification used that name.  Authors must not
+		use 'image-fit' in their stylesheets.</p>
 	</div>
 
 	<div>
@@ -1306,6 +1312,10 @@ <h3 id="object-position">Positioning Replaced Images: The 'object-position' Prop
 
 		<p class="note">Note that areas of the box not covered by the replaced
 		element will show the element's background.</p>
+
+		<p>User agents MAY accept 'image-position' as an alias for 'object-position', as a
+		previous version of this specification used that name.  Authors must not
+		use 'image-position' in their stylesheets.</p>
 	</div>
 </div>