csswg/css3-cascade Overview.html,1.15,1.16

Update of /sources/public/csswg/css3-cascade
In directory hutz:/tmp/cvs-serv1500/css3-cascade

Modified Files:
	Overview.html 
Log Message:
Change the span.note/.issue styling to more closely match the blocks.

Index: Overview.html
===================================================================
RCS file: /sources/public/csswg/css3-cascade/Overview.html,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- Overview.html	12 Dec 2011 22:14:49 -0000	1.15
+++ Overview.html	28 Feb 2012 23:42:51 -0000	1.16
@@ -22,14 +22,31 @@
 
    <h1>CSS Cascading and Inheritance Level 3</h1>
 
+<<<<<<< Overview.html
+<<<<<<< Overview.html
+   <h2 class="no-num no-toc" id=longstatus-date>Editor's Draft 12 October
+    2011</h2>
+=======
+   <h2 class="no-num no-toc" id=longstatus-date>Editor's Draft 31 October
+=======
    <h2 class="no-num no-toc" id=longstatus-date>Editor's Draft 12 December
+>>>>>>> 1.15
     2011</h2>
+>>>>>>> 1.13
 
    <dl>
     <dt>This version:
 
     <dd><a
+<<<<<<< Overview.html
+<<<<<<< Overview.html
+     href="http://www.w3.org/TR/2011/ED-css3-cascade-20111012/">http://www.w3.org/TR/2011/ED-css3-cascade-20111012/</a>
+=======
+     href="http://www.w3.org/TR/2011/ED-css3-cascade-20111031/">http://www.w3.org/TR/2011/ED-css3-cascade-20111031/</a>
+>>>>>>> 1.13
+=======
      href="http://www.w3.org/TR/2011/ED-css3-cascade-20111212/">http://www.w3.org/TR/2011/ED-css3-cascade-20111212/</a>
+>>>>>>> 1.15
      
 
     <dt>Latest version:
@@ -85,6 +102,15 @@
   <h2 class="no-num no-toc" id=status-of-this-document>Status of this
    document</h2>
 
+  <p
+   style="background: #fdd; color: red; font-weight: bold; text-align: center; padding: .5em; border: thick solid red; border-radius: 1em; position: fixed; bottom: 1em; left: 1em; right: 1em;">This
+   specification is not being actively maintained, and must not be used as a
+   guide for implementations. It may be revived in the future, but for now
+   should be considered obsolete. <br>
+   If you have questions or comments on this specification, please send an
+   email to the CSSWG's mailing list at <a
+   href="mailto:www-style@w3.org">www-style@w3.org</a>.
+
   <p>This is a draft of a <a href="http://www.w3.org/TR/css3-roadmap/">module
    of CSS level 3</a>. It will probably be bundled with some other modules
    before it becomes a <a href="http://www.w3.org/TR/#About">W3C
@@ -122,33 +148,73 @@
   <ul class=toc>
    <li><a href="#introduction"><span class=secno>1. </span>Introduction</a>
 
+<<<<<<< Overview.html
+   <li><a href="#input-to-and-output-from-this-module"><span class=secno>2.
+    </span>Input to and output from this module</a>
+=======
    <li><a href="#combine"><span class=secno>2. </span>Combining Style
     Sheets</a>
     <ul class=toc>
      <li><a href="#at-import"><span class=secno>2.1. </span>Importing style
       sheets</a>
+>>>>>>> 1.13
 
+<<<<<<< Overview.html
+   <li><a href="#at-import"><span class=secno>3. </span>Importing style
+    sheets</a>
+=======
      <li><a href="#altss"><span class=secno>2.2. </span> Alternate Style
       Sheets</a>
+>>>>>>> 1.13
 
+<<<<<<< Overview.html
+   <li><a href="#at-media-rule"><span class=secno>4. </span>Named
+    <code>@media</code> rules</a>
+=======
      <li><a href="#at-media-rule"><span class=secno>2.3. </span> Named
       <code>@media</code> rules</a>
     </ul>
+>>>>>>> 1.13
 
+<<<<<<< Overview.html
+   <li><a href="#cascading"><span class=secno>5. </span>Cascading</a>
+=======
    <li><a href="#cascade"><span class=secno>3. </span> Cascading and
     Inheritance</a>
     <ul class=toc>
      <li><a href="#cascading"><span class=secno>3.1. </span> Cascading</a>
+>>>>>>> 1.13
 
+<<<<<<< Overview.html
+   <li><a href="#inheritance"><span class=secno>6. </span>Inheritance</a>
+=======
      <li><a href="#inheritance"><span class=secno>3.2. </span>
       Inheritance</a>
+>>>>>>> 1.13
 
+<<<<<<< Overview.html
+   <li><a href="#initial-value"><span class=secno>7. </span>Initial value</a>
+    
+=======
      <li><a href="#initial"><span class=secno>3.3. </span> Initial value</a>
+>>>>>>> 1.13
 
+<<<<<<< Overview.html
+   <li><a href="#computing-weight"><span class=secno>8. </span>Computing
+    weight</a>
+=======
      <li><a href="#computing-weight"><span class=secno>3.4. </span> Computing
       weight</a>
     </ul>
+>>>>>>> 1.13
 
+<<<<<<< Overview.html
+<<<<<<< Overview.html
+   <li><a href="#conformance"><span class=secno>9. </span>Conformance</a>
+=======
+   <li><a href="#conformance"><span class=secno>4. </span>Conformance</a>
+>>>>>>> 1.13
+=======
    <li><a href="#value-stages"><span class=secno>4. </span> Stages of Value
     Computation</a>
     <ul class=toc>
@@ -169,6 +235,7 @@
     </ul>
 
    <li><a href="#conformance"><span class=secno>5. </span>Conformance</a>
+>>>>>>> 1.15
 
    <li class=no-num><a href="#acknowledgments">Acknowledgments</a>
 
@@ -197,17 +264,97 @@
 
   <p>The opposite problem arises when no declarations try to set a the value
    for an element/property combination. In this case, a value must be found
+<<<<<<< Overview.html
+   by way of <a href="#inherited"><em>inheritance</em></a> or by looking at
+   the property's <a href="#initial-value0"><em>initial value</em></a>.
+=======
    by way of <a href="#inherited"><em>inheritance</em></a> or by looking at
    the property's <a href="#initial-value"><em>initial value</em></a>.
+>>>>>>> 1.13
 
   <p>The rules for finding a the specified value for all properties on all
    elements is described in this specification. The rules for finding the
    specified values in the page context and the margin boxes are described in
    <a href="#CSS3PAGE" rel=biblioentry>[CSS3PAGE]<!--{{CSS3PAGE}}--></a>.
 
+<<<<<<< Overview.html
+  <h2 id=input-to-and-output-from-this-module><span class=secno>2.
+   </span>Input to and output from this module</h2>
+
+  <p>The input to the computations described in this module is:
+
+  <ul>
+   <li>a set of parsed style sheets
+
+   <li>the initial value of each property
+
+   <li>the title of the preferred style sheet (if any)
+  </ul>
+
+  <p>The output of the computations described in this module is a specified
+   value for all properties on all elements.
+
+  <p>In order to find the specified values, implementations must first
+   identify which statements that apply to the document. This is done by:
+
+  <ol>
+   <li>Starting out with all author style sheets specified in the document,
+    as well all user and UA style sheets.
+
+   <li>Removing statements that have associated Media Queries <a
+    href="#MEDIAQ" rel=biblioentry>[MEDIAQ]<!--{{!MEDIAQ}}--></a> that are
+    false in the given context.
+
+   <li>Removing @import statements that do not match the title of the
+    preferred style sheet, if any. This is described in <a
+    href="#import">Importing style sheets</a> below.
+
+   <li>Removing @media statements that do not match the title of the
+    preferred style sheet, if any. This is described in <a
+    href="#import">Named @media rules</a> below.
+
+   <li>Expanding all remaining @import rules.
+  </ol>
+
+  <p>Then, for every element, the value for each property can be found by
+   following this pseudo-algorithm:
+
+  <ol>
+   <li>Identify all declarations that apply to the element (as described in
+    <a href="#SELECT" rel=biblioentry>[SELECT]<!--{{!SELECT}}--></a>)
+
+   <li>If the cascading process (described below) yields a winning
+    declaration and the value of the winning declaration is not &lsquo;<code
+    class=css>initial</code>&rsquo; or &lsquo;<code
+    class=css>inherit</code>&rsquo;, the value of the winning declaration
+    becomes the specified value.
+
+   <li>Otherwise, if the value of the winning declaration is &lsquo;<code
+    class=css>inherit</code>&rsquo;, the inherited value (see below) becomes
+    the specified value.
+
+   <li>Otherwise, if the value of the winning declaration is &lsquo;<code
+    class=css>initial</code>&rsquo;, the initial value (see below) becomes
+    the specified value.
+
+   <li>Otherwise, if the property is inherited, the inherited value becomes
+    the specified value.
+
+   <li>Otherwise, the initial value becomes the specified value.
+  </ol>
+
+  <p>The specified value may need some computation before it can be used.
+   This is described in the <a href="/TR/css3-values">Values and Units</a> <a
+   href="#CSS3VAL" rel=biblioentry>[CSS3VAL]<!--{{!CSS3VAL}}--></a> module.
+=======
   <h2 id=combine><span class=secno>2. </span>Combining Style Sheets</h2>
+>>>>>>> 1.13
 
+<<<<<<< Overview.html
+  <h2 id=at-import><span class=secno>3. </span>Importing style sheets</h2>
+=======
   <h3 id=at-import><span class=secno>2.1. </span>Importing style sheets</h3>
+>>>>>>> 1.13
 
   <p>The <dfn id=import>&lsquo;<code class=css>@import</code>&rsquo;</dfn>
    rule allows users to import style rules from other style sheets. Any
@@ -391,8 +538,13 @@
    must ignore any medium specified for the same style sheet in a link from a
    document?]
 
+<<<<<<< Overview.html
+  <h2 id=at-media-rule><span class=secno>4. </span>Named <a
+   href="#media"><code>@media</code></a> rules</h2>
+=======
   <h3 id=at-media-rule><span class=secno>2.3. </span> Named <a
    href="#media"><code>@media</code></a> rules</h3>
+>>>>>>> 1.13
 
   <p>An <dfn id=media>@media</dfn> rule specifies the target media types
    (separated by commas) of a set of rules (delimited by curly braces). The
@@ -515,6 +667,9 @@
 </pre>
   </div>
 
+<<<<<<< Overview.html
+  <h2 id=cascading><span class=secno>5. </span>Cascading</h2>
+=======
   <h2 id=cascade><span class=secno>3. </span> Cascading and Inheritance</h2>
 
   <p>The input to the computations described in this module is:
@@ -584,6 +739,7 @@
    href="#CSS3VAL" rel=biblioentry>[CSS3VAL]<!--{{!CSS3VAL}}--></a> module.
 
   <h3 id=cascading><span class=secno>3.1. </span> Cascading</h3>
+>>>>>>> 1.13
 
   <p>The purpose of cascading is to find one <dfn
    id=winning-declaration>winning declaration</dfn> among the set of
@@ -611,7 +767,11 @@
 
   <p>The sorting process continues until one winning declaration is found.
 
+<<<<<<< Overview.html
+  <h2 id=inheritance><span class=secno>6. </span>Inheritance</h2>
+=======
   <h3 id=inheritance><span class=secno>3.2. </span> Inheritance</h3>
+>>>>>>> 1.13
 
   <p>Inheritance is a way of propagating property values from parent elements
    to their children. Inheritance means that the specified value of a given
@@ -641,7 +801,11 @@
    class=css>inherit</code>&rsquo; value is set on the root element, the
    property is assigned its initial value.
 
+<<<<<<< Overview.html
+  <h2 id=initial-value><span class=secno>7. </span>Initial value</h2>
+=======
   <h3 id=initial><span class=secno>3.3. </span> Initial value</h3>
+>>>>>>> 1.13
 
   <p>Each property has an <dfn id=initial-value>initial value</dfn> which
    becomes the specified value when cascading and inheritance does not yield
@@ -653,7 +817,11 @@
 -->
    
 
+<<<<<<< Overview.html
+  <h2 id=computing-weight><span class=secno>8. </span>Computing weight</h2>
+=======
   <h3 id=computing-weight><span class=secno>3.4. </span> Computing weight</h3>
+>>>>>>> 1.13
 
   <p>In order to sort declarations in the cascading process, the weight of a
    declaration must be known. In CSS3, the weight of a declaration is based
@@ -938,6 +1106,13 @@
 
      <td>&lsquo;<code class=css>outside</code>&rsquo;
 
+<<<<<<< Overview.html
+<<<<<<< Overview.html
+  <h2 id=conformance><span class=secno>9. </span>Conformance</h2>
+=======
+  <h2 id=conformance><span class=secno>4. </span>Conformance</h2>
+>>>>>>> 1.13
+=======
      <td>&lsquo;<code class=css>outside</code>&rsquo;
 
      <td>&lsquo;<code class=css>outside</code>&rsquo;
@@ -1036,6 +1211,7 @@
   </table>
 
   <h2 id=conformance><span class=secno>5. </span>Conformance</h2>
+>>>>>>> 1.15
 
   <p>[TBD]
 
@@ -1095,10 +1271,18 @@
 
    <dt id=SELECT>[SELECT]
 
+<<<<<<< Overview.html
+   <dd>Tantek &#199;elik; et al. <a
+    href="http://www.w3.org/TR/2009/PR-css3-selectors-20091215"><cite>Selectors
+    Level 3.</cite></a> 15 December 2009. W3C Proposed Recommendation. (Work
+    in progress.) URL: <a
+    href="http://www.w3.org/TR/2009/PR-css3-selectors-20091215">http://www.w3.org/TR/2009/PR-css3-selectors-20091215</a>
+=======
    <dd>Tantek &#199;elik; et al. <a
     href="http://www.w3.org/TR/2011/REC-css3-selectors-20110929/"><cite>Selectors
     Level 3.</cite></a> 29 September 2011. W3C Recommendation. URL: <a
     href="http://www.w3.org/TR/2011/REC-css3-selectors-20110929/">http://www.w3.org/TR/2011/REC-css3-selectors-20110929/</a>
+>>>>>>> 1.13
     </dd>
    <!---->
   </dl>
@@ -1114,11 +1298,26 @@
 
    <dt id=CSS3CASCADE>[CSS3CASCADE]
 
+<<<<<<< Overview.html
+   <dd>Bert Bos; et al. <a
+<<<<<<< Overview.html
+    href="http://www.w3.org/TR/2011/REC-CSS2-20110607/"><cite>Cascading Style
+    Sheets Level 2 Revision 1 (CSS&#160;2.1) Specification.</cite></a> 7 June
+    2011. W3C Recommendation. URL: <a
+    href="http://www.w3.org/TR/2011/REC-CSS2-20110607/">http://www.w3.org/TR/2011/REC-CSS2-20110607/</a>
+=======
+    href="http://www.w3.org/TR/2011/REC-CSS2-20110607"><cite>Cascading Style
+    Sheets Level 2 Revision 1 (CSS&#160;2.1) Specification.</cite></a> 7 June
+    2011. W3C Recommendation. URL: <a
+    href="http://www.w3.org/TR/2011/REC-CSS2-20110607">http://www.w3.org/TR/2011/REC-CSS2-20110607</a>
+>>>>>>> 1.13
+=======
    <dd>H&#229;kon Wium Lie. <a
     href="http://www.w3.org/TR/2005/WD-css3-cascade-20051215"><cite>CSS3
     module: Cascading and inheritance.</cite></a> 15 December 2005. W3C
     Working Draft. (Work in progress.) URL: <a
     href="http://www.w3.org/TR/2005/WD-css3-cascade-20051215">http://www.w3.org/TR/2005/WD-css3-cascade-20051215</a>
+>>>>>>> 1.15
     </dd>
    <!---->
 
@@ -1151,37 +1350,88 @@
     title="actual value"><strong>4.4.</strong></a>
 
    <li>Alternate style sheets, <a href="#alternate-style-sheets"
+<<<<<<< Overview.html
+    title="Alternate style sheets"><strong>3.</strong></a>
+=======
     title="Alternate style sheets"><strong>2.2.</strong></a>
+>>>>>>> 1.13
 
    <li>alternative style sheets, <a href="#alternative-style-sheets"
+<<<<<<< Overview.html
+    title="alternative style sheets"><strong>3.</strong></a>
+=======
     title="alternative style sheets"><strong>2.2.</strong></a>
+>>>>>>> 1.13
 
+<<<<<<< Overview.html
+<<<<<<< Overview.html
+   <li>conditional import, <a href="#conditional-imports"
+    title="conditional import"><strong>3.</strong></a>
+=======
+=======
    <li>computed value, <a href="#computed-value"
     title="computed value"><strong>4.2.</strong></a>
 
+>>>>>>> 1.15
    <li>conditional import, <a href="#conditional-imports"
     title="conditional import"><strong>2.1.</strong></a>
+>>>>>>> 1.13
 
    <li>&lsquo;<code class=css>@import</code>&rsquo;, <a href="#import"
+<<<<<<< Overview.html
+    title="'@import'"><strong>3.</strong></a>
+=======
     title="'@import'"><strong>2.1.</strong></a>
+>>>>>>> 1.13
 
    <li>inheritance, <a href="#inherited"
+<<<<<<< Overview.html
+    title=inheritance><strong>6.</strong></a>
+=======
     title=inheritance><strong>3.2.</strong></a>
+>>>>>>> 1.13
 
+<<<<<<< Overview.html
+   <li>initial value, <a href="#initial-value0"
+    title="initial value"><strong>7.</strong></a>
+=======
    <li>initial value, <a href="#initial-value"
     title="initial value"><strong>3.3.</strong></a>
+>>>>>>> 1.13
 
+<<<<<<< Overview.html
+   <li>@media, <a href="#media" title="@media"><strong>4.</strong></a>
+=======
    <li>@media, <a href="#media" title="@media"><strong>2.3.</strong></a>
+>>>>>>> 1.13
 
    <li>media-dependent import, <a href="#conditional-imports"
+<<<<<<< Overview.html
+    title="media-dependent import"><strong>3.</strong></a>
+=======
     title="media-dependent import"><strong>2.1.</strong></a>
+>>>>>>> 1.13
 
    <li>persistent style sheets, <a href="#persistent-style-sheets"
+<<<<<<< Overview.html
+    title="persistent style sheets"><strong>3.</strong></a>
+=======
     title="persistent style sheets"><strong>2.2.</strong></a>
+>>>>>>> 1.13
 
    <li>preferred style sheet, <a href="#preferred-style-sheet"
+<<<<<<< Overview.html
+    title="preferred style sheet"><strong>3.</strong></a>
+=======
     title="preferred style sheet"><strong>2.2.</strong></a>
+>>>>>>> 1.13
 
+<<<<<<< Overview.html
+<<<<<<< Overview.html
+   <li>winning declaration, <a href="#winning-declaration"
+    title="winning declaration"><strong>5.</strong></a>
+=======
+=======
    <li>specified value, <a href="#specified-value"
     title="specified value"><strong>4.1.</strong></a>, <a
     href="#specified-value0"
@@ -1191,8 +1441,10 @@
     title="used value"><strong>4.3.</strong></a>, <a href="#used-value0"
     title="used value"><strong>4.3.</strong></a>
 
+>>>>>>> 1.15
    <li>winning declaration, <a href="#winning-declaration"
     title="winning declaration"><strong>3.1.</strong></a>
+>>>>>>> 1.13
   </ul>
   <!--end-index-->
 

Received on Tuesday, 28 February 2012 23:42:56 UTC