move serializing and parsing selectors as well

Author: annevk

cssom/Overview.html

@@ -165,7 +165,13 @@ <h2 class="no-num no-toc" id=toc>Table of Contents</h2>
           of the serializing algorithm </a>
         </ul>
 
-       <li><a href="#processing"><span class=secno>3.1.2. </span>Processing
+       <li><a href="#selectors"><span class=secno>3.1.2. </span>Selectors</a>
+        
+
+       <li><a href="#css-page"><span class=secno>3.1.3. </span>CSS Page
+        Selectors</a>
+
+       <li><a href="#processing"><span class=secno>3.1.4. </span>Processing
         CSS Statements</a>
       </ul>
 
@@ -300,11 +306,9 @@ <h2 class="no-num no-toc" id=toc>Table of Contents</h2>
 
    <li><a href="#canon"><span class=secno>5. </span>Canonicalization </a>
     <ul class=toc>
-     <li><a href="#selectors"><span class=secno>5.1. </span>Selectors</a>
-
-     <li><a href="#media"><span class=secno>5.2. </span>Media queries</a>
+     <li><a href="#media"><span class=secno>5.1. </span>Media queries</a>
       <ul class=toc>
-       <li><a href="#examples1"><span class=secno>5.2.1. </span>Examples</a>
+       <li><a href="#examples1"><span class=secno>5.1.1. </span>Examples</a>
       </ul>
     </ul>
 
@@ -1131,7 +1135,7 @@ <h3 id=parsing><span class=secno>3.1. </span>Parsing and Serializing CSS
   <!--
    statement "[S|CDO|CDC]* [ import [S|CDO|CDC]* ]* [ [ ruleset | media | page ] [S|CDO|CDC]* ]*" ??
 
-   selectors "S* selector [ COMMA S* selector ]*"
+   selectors "*"
    page selectors "S* pseudo_page? S*"
 
    declaration "S* declaration" (properties, property values, property priority)
@@ -1150,16 +1154,14 @@ <h4 id=css-values><span class=secno>3.1.1. </span>CSS values</h4>
    operation failed.
 
   <ol>
-   <li>Remove any leading <a href="#whitespace">whitespace</a> characters.
-
-   <li>Parse the remainder using the <code>expr</code> production in
+   <li>Parse the value using the <code>S* expr</code> production in
     combination with the allowed values for the given <var
     title="">property</var>. If this fails return "null". Otherwise return
     the parsed value.
   </ol>
 
-  <p>The <code>expr</code> production is defined in the CSS 2.1
-   specification. [CSS21]
+  <p>The aforementioned production is defined in the CSS 2.1 specification.
+   [CSS]
 
   <p>The rules for <dfn id=serializing title="CSS value
    serializing">serializing a CSS value</dfn> are as given in the following
@@ -1398,7 +1400,56 @@ <h5 id=examples0><span class=secno>3.1.1.1. </span>Examples of the
    </table>
   </div>
 
-  <h4 id=processing><span class=secno>3.1.2. </span>Processing CSS Statements</h4>
+  <h4 id=selectors><span class=secno>3.1.2. </span>Selectors</h4>
+
+  <p>The rules for <dfn id=parsing1 title=selectors-parsing>parsing a group
+   of selectors</dfn> are as given in the following algorithm. The return
+   value is either a group of selectors or "null" (if parsing failed).
+
+  <ol>
+   <li>Parse the value using the <code>selectors_group</code> production. If
+    this fails return "null". Otherwise return the parsed value.
+  </ol>
+
+  <p>The aforementioned production is defined in the Selectors specification.
+   [Selectors]
+
+  <p>The rules for <dfn id=serializing0 title="selectors
+   serializing">serializing a group of selectors</dfn> are as given in the
+   following algorithm:
+
+  <ol>
+   <li>
+    <p>Replace one or more consecutive <a href="#whitespace">whitespace</a>
+     characters with a single U+0020 character.
+
+   <li>
+    <p>Remove leading and trailing <a href="#whitespace">whitespace</a>.
+
+   <li>
+    <p>Make sure combinators other than the descendant combinator are
+     preceded and followed by a single U+0020 character (and not more).
+
+   <li>
+    <p>Make sure each U+002C (<code>,</code>) character is followed by a
+     single U+0020 character (and not more).
+
+   <li>
+    <p>Convert pseudo-classes and pseudo-elements to their canonical form as
+     given in the specification. <span class=note><code>:HOver</code> becomes
+     <code>:hover</code> and <code>:befoRe</code> becomes
+     <code>::before</code> for example.</span>
+
+   <li>
+    <p class=issue>Hmm, what about pseudo-classes taking arguments? Attribute
+     selectors? Namespace prefixes?
+  </ol>
+
+  <h4 id=css-page><span class=secno>3.1.3. </span>CSS Page Selectors</h4>
+
+  <p class=issue>...
+
+  <h4 id=processing><span class=secno>3.1.4. </span>Processing CSS Statements</h4>
 
   <p>The rules for <dfn id=inserting title="insert a statement">inserting a
    statement</dfn> are as given in the following algorithm. The variables
@@ -3136,42 +3187,7 @@ <h2 id=canon><span class=secno>5. </span>Canonicalization</h2>
   <p>The definitions from this section are used later to define attribute
    values, et cetera.
 
-  <h3 id=selectors><span class=secno>5.1. </span>Selectors</h3>
-
-  <p>The <dfn id=canon-selectors>canonicalization of a group of
-   selectors</dfn> can be determined as follows:
-
-  <ol>
-   <li><a href="#canonicalization" title=canon-selector>Normalize the
-    individual selectors</a>.
-
-   <li>Separate those selectors by a literal U+002C COMMA and U+0020 SPACE.
-  </ol>
-
-  <p>The <dfn id=canonicalization title=canon-selector>canonicalization of a
-   selector</dfn> can be determined as follows:
-
-  <ol>
-   <li>Take the literal input.
-
-   <li>Replace one or more consecutive <a href="#whitespace">whitespace</a>
-    characters with a U+0020 SPACE.
-
-   <li>Remove leading and trailing <a href="#whitespace">whitespace</a>.
-
-   <li>Make sure combinators other than the descendant combinator are
-    preceded and followed by a U+0020 SPACE. (So only insert it when it's not
-    there already.)
-
-   <li>Pseudo-classes and pseudo-elements are to be converted to their
-    canonical form. <code>:HOver</code> becomes <code>:hover</code> and
-    <code>:befoRe</code> becomes <code>::before</code> for example.
-  </ol>
-
-  <p class=issue>Hmm, what about pseudo-classes taking arguments? Attribute
-   selectors? Namespace prefixes?
-
-  <h3 id=media><span class=secno>5.2. </span>Media queries</h3>
+  <h3 id=media><span class=secno>5.1. </span>Media queries</h3>
 
   <p>The <dfn id=canon-media title=canon-media>canonicalization of a media
    query</dfn> can be determined as follows:
@@ -3205,7 +3221,7 @@ <h3 id=media><span class=secno>5.2. </span>Media queries</h3>
 
   <p class=issue>duplicate features?
 
-  <h4 id=examples1><span class=secno>5.2.1. </span>Examples</h4>
+  <h4 id=examples1><span class=secno>5.1.1. </span>Examples</h4>
 
   <div class=example>
    <p>The canonical form of the following query:</p>

cssom/Overview.src.html

@@ -820,7 +820,7 @@ <h3>Parsing and Serializing CSS Constructs</h3>
   <!--
    statement "[S|CDO|CDC]* [ import [S|CDO|CDC]* ]* [ [ ruleset | media | page ] [S|CDO|CDC]* ]*" ??
 
-   selectors "S* selector [ COMMA S* selector ]*"
+   selectors "*"
    page selectors "S* pseudo_page? S*"
 
    declaration "S* declaration" (properties, property values, property priority)
@@ -839,15 +839,13 @@ <h4>CSS values</h4>
   The result is either a CSS value or "null" if the operation failed.</p>
 
   <ol>
-   <li>Remove any leading <span>whitespace</span> characters.</li>
-   
-   <li>Parse the remainder using the <code>expr</code> production in combination
+   <li>Parse the value using the <code>S* expr</code> production in combination
    with the allowed values for the given <var title="">property</var>. If this
    fails return "null". Otherwise return the parsed value.</li>
   </ol>
 
-  <p>The <code>expr</code> production is defined in the CSS 2.1
-  specification. [CSS21]</p>
+  <p>The aforementioned production is defined in the CSS 2.1 specification.
+  [CSS]</p>
 
 
   <p>The rules for <dfn title="CSS value serializing">serializing a CSS
@@ -1025,6 +1023,48 @@ <h5>Examples of the serializing algorithm</h4>
 
 
 
+  <h4>Selectors</h4>
+
+  <p>The rules for <dfn title="selectors-parsing">parsing a group of
+  selectors</dfn> are as given in the following algorithm. The return value is
+  either a group of selectors or "null" (if parsing failed).</p>
+
+  <ol>
+   <li>Parse the value using the <code>selectors_group</code> production. If
+   this fails return "null". Otherwise return the parsed value.</li>
+  </ol>
+
+  <p>The aforementioned production is defined in the Selectors specification.
+  [Selectors]</p>
+
+  <p>The rules for <dfn title="selectors serializing">serializing a group of
+  selectors</dfn> are as given in the following algorithm:</p>
+
+  <ol>
+   <li><p>Replace one or more consecutive <span>whitespace</span> characters
+   with a single U+0020 character.</p></li>
+   
+   <li><p>Remove leading and trailing <span>whitespace</span>.</p></li>
+
+   <li><p>Make sure combinators other than the descendant combinator are
+   preceded and followed by a single U+0020 character (and not more).</p></li>
+
+   <li><p>Make sure each U+002C (<code>,</code>) character is followed by a
+   single U+0020 character (and not more).</p></li>
+
+   <li><p>Convert pseudo-classes and pseudo-elements to their canonical form as
+   given in the specification. <span class="note"><code>:HOver</code> becomes
+   <code>:hover</code> and <code>:befoRe</code> becomes <code>::before</code>
+   for example.</span></p></li>
+
+   <li><p class="issue">Hmm, what about pseudo-classes taking arguments?
+   Attribute selectors? Namespace prefixes?</p></li>
+  </ol>
+
+  <h4>CSS Page Selectors</h4>
+  
+  <p class="issue">...</p>
+
 
   <h4>Processing CSS Statements</h4>
 
@@ -2601,37 +2641,6 @@ <h2 id="canon" >Canonicalization</h4>
   <p>The definitions from this section are used later to define attribute
   values, et cetera.</p>
 
-  <h3>Selectors</h3>
-
-  <p>The <dfn id="canon-selectors">canonicalization of a group of
-   selectors</dfn> can be determined as follows:</p>
-
-  <ol>
-   <li><span title="canon-selector">Normalize the individual
-   selectors</span>.</li>
-
-   <li>Separate those selectors by a literal U+002C COMMA and U+0020
-   SPACE.</li>
-  </ol>
-
-  <p>The <dfn title="canon-selector">canonicalization of a selector</dfn> can be
-  determined as follows:</p>
-
-  <ol>
-   <li>Take the literal input.</li>
-   <li>Replace one or more consecutive <span>whitespace</span> characters with
-    a U+0020 SPACE.</li>
-   <li>Remove leading and trailing <span>whitespace</span>.</li>
-   <li>Make sure combinators other than the descendant combinator are
-    preceded and followed by a U+0020 SPACE. (So only insert it when it's not
-    there already.)</li>
-   <li>Pseudo-classes and pseudo-elements are to be converted to their
-    canonical form. <code>:HOver</code> becomes <code>:hover</code> and
-    <code>:befoRe</code> becomes <code>::before</code> for example.</li>
-  </ol>
-
-  <p class="issue">Hmm, what about pseudo-classes taking arguments? Attribute
-   selectors? Namespace prefixes?</p>
 
   <h3>Media queries</h3>