w3c
diff --git a/‎css2/cascade.html‎
Lines changed: 4 additions & 4 deletions b/‎css2/cascade.html‎
Lines changed: 4 additions & 4 deletions
diff --git a/‎css2/changes.html‎
Lines changed: 121 additions & 16 deletions b/‎css2/changes.html‎
Lines changed: 121 additions & 16 deletions
diff --git a/‎css2/changes.src‎
Lines changed: 119 additions & 17 deletions b/‎css2/changes.src‎
Lines changed: 119 additions & 17 deletions
@@ -88,7 +88,7 @@ <h3>6.1.2 <span class="index-def" title="computed value">
 <p>The computed value of URIs that the UA cannot resolve to absolute
 URIs is the specified value.
 
-<p>When the specified value is not 'inherit', the computed value of a
+<p>The computed value of a
 pro
2851
perty is determined as specified by the Computed Value line in the
 definition of the
 property. See the section on <a href="#inheritance">inheritance</a>
@@ -186,10 +186,10 @@ <h3>6.2.1 The <span class="index-def" title="inherit, definition
 of"><a name="value-def-inherit">'inherit'</a></span>
 value</h3>
 
-<P>Each property may also have a specified value of 'inherit', which
-means that, for a given element, the property takes the same computed
+<P>Each property may also have a cascaded value of 'inherit', which
+means that, for a given element, the property takes the same specified
 value as the property for the element's parent. The 'inherit' value
-can be used to strengthen inherited values, and it can also be used on
+can be used to enforce inheritance of values, and it can also be used on
 properties that are not normally inherited.
 
 <p>If the 'inherit' value is set on the root element, the property is
 
@@ -583,6 +583,9 @@ <H1><a name="q0">Appendix C. Changes</a></H1>
       <li class="tocline3"><a href="changes.html#q540" class="tocxref">C.8.46 9.5 Floats</a>
       <li class="tocline3"><a href="changes.html#q541" class="tocxref">C.8.47 14.2.1 Background properties: 'background-color', 'background-image', 'background-repeat', 'background-attachment', 'background-position', and 'background'</a>
       <li class="tocline3"><a href="changes.html#q542" class="tocxref">C.8.48 9.2.4 The 'display' property</a>
+      <li class="tocline3"><a href="changes.html#q543" class="tocxref">C.8.49 6.1.2 Computed values</a>
+      <li class="tocline3"><a href="changes.html#q544" class="tocxref">C.8.50 10.3.2 Inline, replaced elements</a>
+      <li class="tocline3"><a href="changes.html#q545" class="tocxref">C.8.51  Section&nbsp;9.5.2 Controlling flow next to floats: the 'clear' property</a>
     </ul>
   </ul>
 </div>
@@ -5744,7 +5747,11 @@ <h3 id="t.9.10b"><a name="q437">C.7.48 </a><a
 <p>In this process, <del>non-textual entities such as images</del>
 <ins>replaced elements with 'display: inline' (and replaced elements
 with 'display: run-in', when they generate inline-level boxes)</ins>
-are treated as neutral characters, [&hellip]
+are treated as neutral characters, unless their 'unicode-bidi'
+property has a value other than 'normal', in which case they are
+treated as strong characters in the 'direction' specified for the
+element. <ins>All other atomic inline-level boxes are treated as
+neutral characters always.</ins>
 </blockquote>
 
 
@@ -7592,6 +7599,7 @@ <h3 id=u.10.4><a name="q522">C.8.28 </a><a
 
 <blockquote>
 <p><ins>In CSS&nbsp;2.1, the effect of 'min-width' and 'max-width' on
+tables, inline tables,
 table cells, table columns, and column groups is undefined.</ins>
 </blockquote>
 
@@ -7945,14 +7953,24 @@ <h3 id=u.9.2.4><a name="q542">C.8.48 </a><a
 
 <p>Change in section 9.2.4:
 
+<blockquote>
+<table class="propinfo">
+<tr valign=baseline><td><em>Value:</em> <td>inline | block | list-item
+| <del>run-in |</del> inline-block | table | inline-table | inline |
+block | list-item | run-in | inline-block | table | inline-table |
+table-row-group | table-header-group | table-footer-group | table-row
+| table-column-group | table-column | table-cell | table-caption |
+none | inherit
+</table>
+</blockquote>
+
+<p>and
+
 <blockquote>
 <dl>
-<dt>run-in <dd>This value creates either block or inline boxes,
-depending on context. <del>Properties apply to run-in boxes based on
-their final status (inline-level or block-level).</del> <ins>'Run-in'
-is defined in CSS level&nbsp;3 (see <a href="/TR/css3-box">CSS basic
-box model</a>). It is not required for conformance to
-level&nbsp;2.</ins>
+<dt><del>run-in</del> <dd><del>This value creates either block or inline boxes,
+depending on context. Properties apply to run-in boxes based on
+their final status (inline-level or block-level).</del>
 </dl>
 </blockquote>
 
@@ -7984,19 +8002,14 @@ <h3 id=u.9.2.4><a name="q542">C.8.48 </a><a
 
 <p>Replace <a
 href="/TR/2010/WD-CSS2-20101207/visuren.html#run-in">section 9.2.3
-&ldquo;Run-in boxes&rdquo;</a>:
+&ldquo;Run-in boxes&rdquo;</a> by this:
 
 <blockquote>
 <p><strong>9.2.3 Run-in boxes</strong>
 
-<p><del>A run-in element (or pseudo-element) <var>A</var> behaves as
-
follows: […] Please consult the section on generated contentfollows: [&hellip;] Please consult the section on generated content
-for information about how run-in boxes interact with generated
-content.</del>
-
-<p><ins>[This section exists so that the section numbers are the same
-as in previous drafts. Run-in boxes are not part of
-CSS&nbsp;2.1.]</ins>
+<p>[This section exists so that the section numbers are the same as in
+previous drafts. 'Display: run-in' is now defined in CSS level&nbsp;3
+(see <a href="/TR/css3-box">CSS basic box model</a>).]
 </blockquote>
 
 <p>Remove 'run-in' from <a
@@ -8085,6 +8098,98 @@ <h3 id=u.9.2.4><a name="q542">C.8.48 </a><a
 
 
 
+<h3 id=u.6.1.2><a name="q543">C.8.49 </a><a
+href="/TR/2010/WD-CSS2-20101207/cascade.html#computed-value">6.1.2
+Computed values</a></h3>
+
+<p>Clarify that the keyword 'inherit' means that the specified value
+is the inherited value. The value is <em>not</em> the keyword itself.
+
+<blockquote>
+<p><del>When the specified value is not 'inherit',</del> the computed
+value of a property is determined as specified by the Computed Value
+line in the definition of the property. See the section on <a
+href="#inheritance">inheritance</a> for the definition of computed
+values when the specified value is 'inherit'.
+</blockquote>
+
+<p>And in <a
+href="/TR/2010/WD-CSS2-20101207/cascade.html#value-def-inherit">6.2.1:</a>
+
+<blockquote>
+<p>Each property may also have a <del>specified</del
33CD
>
+<ins>cascaded</ins> value of 'inherit', which means that, for a given
+element, the property takes the same <del>computed</del>
+<ins>specified</ins> value as the property for the element's
+parent. The 'inherit' value can be used to <del>strengthen
+inherited</del> <ins>enforce inheritance of</ins> values, and it can
+also be used on properties that are not normally inherited.
+</blockquote>
+
+
+
+<h3 id=u.10.3.2a><a name="q544">C.8.50 </a><a
+href="/TR/2010/WD-CSS2-20101207/visudet.html#inline-replaced-width">10.3.2
+Inline, replaced elements</a></h3>
+
+<p>Because of lack of implementations, the width of a replaced element
+with an intrinsic ratio but neither intrinsic with nor intrinsic
+height is left undefined:
+
+<blockquote>
+<p>If 'height' and 'width' both have computed values of 'auto' and the
+element has an intrinsic ratio but no intrinsic height or width,
+<del>and the containing block's width does not itself depend on the
+replaced element's width, then the used value of 'width' is calculated
+from the constraint equation used for block-level, non-replaced
+elements in normal flow</del> <ins>then the used value of 'width' is
+undefined in CSS&nbsp;2.1</ins>.
+</blockquote>
+
+
+
+<h3 id="t.9.5.2d"><a name="q545">C.8.51 </a><a
+href="/TR/2009/CR-CSS2-20090908/visuren.html#flow-control">
+Section&nbsp;9.5.2 Controlling flow next to floats: the 'clear'
+property</a></h3>
+
+<p>Because of lack of implementations, also allow 'clear' to work in a
+different way for now:
+
+<blockquote>
+<p>Computing the clearance of an element on which 'clear' is set is
+done by first determining the hypothetical position of the element's
+top border edge <del>within its parent block</del>. This position is
+where the actual top border edge would have been if the element had a
+non-zero bottom border and its 'clear' property had been 'none'.
+
+<p>If this hypothetical position of the element's top border edge is
+not past the relevant floats, then clearance is introduced, and
+margins collapse according to the rules in 8.3.1.
+
+<p>Then the amount of clearance is set to the greater of:
+
+<ol>
+  <li>The amount necessary to place the border edge of the block even
+  with the bottom outer edge of the lowest float that is to be
+  cleared.
+ 
+  <li>The amount necessary to place the top border edge of the block
+  at its hypothetical position.
+</ol>
+
+<p><ins>Alternatively, clearance is set exactly to the amount
+necessary to place the border edge of the block even with the bottom
+outer edge of the lowest float that is to be cleared.</ins>
+
+<p class="note"><ins><em><strong>Note:</strong> Both behaviors are
+allowed pending evaluation of their compatibility with existing Web
+content. A future CSS specification will require either one or the
+other.</em></ins>
+</blockquote>
+
+
+
 <hr class="navbar">
 
 <div class="navbar">
 
@@ -1,6 +1,6 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html lang="en">
-<!-- $Id: changes.src,v 2.152 2011-03-25 00:05:00 bbos Exp $ -->
+<!-- $Id: changes.src,v 2.153 2011-03-25 21:10:33 bbos Exp $ -->
 <HEAD>
 <TITLE>Changes</TITLE>
 </HEAD>
@@ -5164,7 +5164,11 @@ entities&rdquo;:
 <p>In this process, <del>non-textual entities such as images</del>
 <ins>replaced elements with 'display: inline' (and replaced elements
 with 'display: run-in', when they generate inline-level boxes)</ins>
-are treated as neutral characters, [&hellip]
+are treated as neutral characters, unless their 'unicode-bidi'
+property has a value other than 'normal', in which case they are
+treated as strong characters in the 'direction' specified for the
+element. <ins>All other atomic inline-level boxes are treated as
+neutral characters always.</ins>
 </blockquote>
 
 <!--========================== issue 120 ==========================-->
@@ -7081,6 +7085,7 @@ Minimum and maximum widths: 'min-width' and 'max-width'</a></h3>
 
 <blockquote>
 <p><ins>In CSS&nbsp;2.1, the effect of 'min-width' and 'max-width' on
+tables, inline tables,
 table cells, table columns, and column groups is undefined.</ins>
 </blockquote>
 
@@ -7434,14 +7439,24 @@ feature.
 
 <p>Change in section 9.2.4:
 
+
<blockquote><blockquote>
+<table class="propinfo">
+<tr valign=baseline><td><em>Value:</em> <td>inline | block | list-item
+| <del>run-in |</del> inline-block | table | inline-table | inline |
+block | list-item | run-in | inline-block | table | inline-table |
+table-row-group | table-header-group | table-footer-group | table-row
+| table-column-group | table-column | table-cell | table-caption |
+none | inherit
+</table>
+</blockquote>
+
+<p>and
+
 <blockquote>
 <dl>
-<dt>run-in <dd>This value creates either block or inline boxes,
-depending on context. <del>Properties apply to run-in boxes based on
-their final status (inline-level or block-level).</del> <ins>'Run-in'
-is defined in CSS level&nbsp;3 (see <a href="/TR/css3-box">CSS basic
-box model</a>). It is not required for conformance to
-level&nbsp;2.</ins>
+<dt><del>run-in</del> <dd><del>This value creates either block or inline boxes,
+depending on context. Properties apply to run-in boxes based on
+their final status (inline-level or block-level).</del>
 </dl>
 </blockquote>
 
@@ -7473,19 +7488,14 @@ boxes.</del>
 
 <p>Replace <a
 href="/TR/2010/WD-CSS2-20101207/visuren.html#run-in">section 9.2.3
-&ldquo;Run-in boxes&rdquo;</a>:
+&ldquo;Run-in boxes&rdquo;</a> by this:
 
 <blockquote>
 <p><strong>9.2.3 Run-in boxes</strong>
 
-<p><del>A run-in element (or pseudo-element) <var>A</var> behaves as
-follows: [&hellip;] Please consult the section on generated content
-for information about how run-in boxes interact with generated
-content.</del>
-
-<p><ins>[This section exists so that the section numbers are the same
-as in previous drafts. Run-in boxes are not part of
-CSS&nbsp;2.1.]</ins>
+<p>[This section exists so that the section numbers are the same as in
+previous drafts. 'Display: run-in' is now defined in CSS level&nbsp;3
+(see <a href="/TR/css3-box">CSS basic box model</a>).]
 </blockquote>
 
 <p>Remove 'run-in' from <a
@@ -7572,6 +7582,98 @@ inserted just inside their associated element.
 
 <p>and also from the subsequent example.
 
+<!--========================== issue 259 ==========================-->
+
+<h3 id=u.6.1.2><a
+href="/TR/2010/WD-CSS2-20101207/cascade.html#computed-value">6.1.2
+Computed values</a></h3>
+
+<p>Clarify that the keyword 'inherit' means that the specified value
+is the inherited value. The value is <em>not</em> the keyword itself.
+
+<blockquote>
+<p><del>When the specified value is not 'inherit',</del> the computed
+value of a property is determined as specified by the Computed Value
+line in the definition of the property. See the section on <a
+href="#inheritance">inheritance</a> for the definition of computed
+values when the specified value is 'inherit'.
+</blockquote>
+
+<p>And in <a
+href="/TR/2010/WD-CSS2-20101207/cascade.html#value-def-inherit">6.2.1:</a>
+
+<blockquote>
+<p>Each property may also have a <del>specified</del>
+<ins>cascaded</ins> value of 'inherit', which means that, for a given
+element, the property takes the same <del>computed</del>
+<ins>specified</ins> value as the property for the element's
+parent. The 'inherit' value can be used to <del>strengthen
+inherited</del> <ins>enforce inheritance of</ins> values, and it can
+also be used on properties that are not normally inherited.
+</blockquote>
+
+<!--========================== issue 283 ==========================-->
+
+<h3 id=u.10.3.2a><a
+href="/TR/2010/WD-CSS2-20101207/visudet.html#inline-replaced-width">10.3.2
+Inline, replaced elements</a></h3>
+
+<p>Because of lack of implementations, the width of a replaced element
+with an intrinsic ratio but neither intrinsic with nor intrinsic
+height is left undefined:
+
+<blockquote>
+<p>If 'height' and 'width' both have computed values of 'auto' and the
+element has an intrinsic ratio but no intrinsic height or width,
+<del>and the containing block's width does not itself depend on the
+replaced element's width, then the used value of 'width' is calculated
+from the constraint equation used for block-level, non-replaced
+elements in normal flow</del> <ins>then the used value of 'width' is
+undefined in CSS&nbsp;2.1</ins>.
+</blockquote>
+
+<!--========================== issue 285 ==========================-->
+
+<h3 id="t.9.5.2d"><a
+href="/TR/2009/CR-CSS2-20090908/visuren.html#flow-control">
+Section&nbsp;9.5.2 Controlling flow next to floats: the 'clear'
+property</a></h3>
+
+<p>Because of lack of implementations, also allow 'clear' to work in a
+different way for now:
+
+<blockquote>
+<p>Computing the clearance of an element on which 'clear' is set is
+done by first determining the hypothetical position of the element's
+top border edge <del>within its parent block</del>. This position is
+where the actual top border edge would have been if the element had a
+non-zero bottom border and its 'clear' property had been 'none'.
+
+<p>If this hypothetical position of the element's top border edge is
+not past the relevant floats, then clearance is introduced, and
+margins collapse according to the rules in 8.3.1.
+
+<p>Then the amount of clearance is set to the greater of:
+
+<ol>
+  <li>The amount necessary to place the border edge of the block even
+  with the bottom outer edge of the lowest float that is to be
+  cleared.
+ 
+  <li>The amount necessary to place the top border edge of the block
+  at its hypothetical position.
+</ol>
+
+<p><ins>Alternatively, clearance is set exactly to the amount
+necessary to place the border edge of the block even with the bottom
+outer edge of the lowest float that is to be cleared.</ins>
+
+<p class="note"><ins><em><strong>Note:</strong> Both behaviors are
+allowed pending evaluation of their compatibility with existing Web
+content. A future CSS specification will require either one or the
+other.</em></ins>
+</blockquote>
+
 
 
 </BODY>