Fix or add <dfn>s to some things, and fix several references to use the preprocessor properly.

Author: tabatkins

selectors4/Overview.html

@@ -1134,30 +1134,32 @@ <h2 id=syntax><span class=secno>3. </span> Selector Syntax and Structure</h2>
 
   <h3 id=structure><span class=secno>3.1. </span> Structure and Terminology</h3>
 
-  <p>The term <dfn id=selector>selector</dfn> can refer to a <i>simple
-   selector</i>, <a href="#compound"><i>compound selector</i></a>, <a
-   href="#complex"><i>complex selector</i></a>, or <a
+  <p>The term <dfn id=selector>selector</dfn> can refer to a <a
+   href="#simple"><i>simple selector</i></a>, <a
+   href="#compound-selector"><i>compound selector</i></a>, <a
+   href="#complex-selector"><i>complex selector</i></a>, or <a
    href="#selector-list"><i>selector list</i></a>.
 
-  <p>A <dfn id=complex>complex selector</dfn> is a chain of one or more <a
-   href="#compound">compound selectors</a> separated by <a
-   href="#combinators">combinators</a>.
-
-  <p>A <dfn id=compound>compound selector</dfn> is a chain of <a
-   href="#simple">simple selectors</a> that are not separated by a <a
-   href="#combinators">combinator</a>. It always begins with a <a
-   href="#type-selectors">type selector</a> or a (possibly implied) <a
-   href="#universal-selector">universal selector</a>. No other type selector
-   or universal selector is allowed in the sequence.
-
-  <p>A <dfn id=simple><a href="#simple">simple selector</a></dfn> is either a
-   <a href="#type-selectors">type selector</a>, <a
-   href="#universal-selector">universal selector</a>, <a
-   href="#attribute-selectors">attribute selector</a>, <a
-   href="#class-html">class selector</a>, <a href="#id-selectors">ID
-   selector</a>, or <a href="#pseudo-classes">pseudo-class</a>.
-
-  <p><dfn id=combinator>Combinators</dfn> are punctuation that represent a
+  <p>A <dfn id=complex-selector>complex selector</dfn> is a chain of one or
+   more <a href="#compound-selector"><i>compound selectors</i></a> separated
+   by <a href="#combinator"><i>combinators</i></a>.
+
+  <p>A <dfn id=compound-selector>compound selector</dfn> is a chain of <a
+   href="#simple"><i>simple selectors</i></a> that are not separated by a <a
+   href="#combinator"><i>combinator</i></a>. It always begins with a <a
+   href="#type-selector"><i>type selector</i></a> or a (possibly implied) <a
+   href="#universal-selector0"><i>universal selector</i></a>. No other type
+   selector or universal selector is allowed in the sequence.
+
+  <p> A <dfn id=simple>simple selector</dfn> is either a <a
+   href="#type-selector"><i>type selector</i></a>, <a
+   href="#universal-selector0"><i>universal selector</i></a>, <a
+   href="#attribute-selector"><i>attribute selector</i></a>, <a
+   href="#class-selector"><i>class selector</i></a>, <a
+   href="#id-selector"><i>ID selector</i></a>, or <a
+   href="#pseudo-class"><i>pseudo-class</i></a>.
+
+  <p>A <dfn id=combinator>combinator</dfn> is punctuation that represents a
    particular kind of relationship between the compound selectors on either
    side. Combinators in Selectors level 4 include: whitespace,
    &quot;greater-than sign&quot; (U+003E, <code>&gt;</code>), &quot;plus
@@ -1215,8 +1217,8 @@ <h3 id=scoping><span class=secno>3.3. </span> Scoped Selectors</h3>
 
    <dd> With this method of scoping, selectors match as if the <a
     href="#scoping-element"><i>scoping element</i></a> were the root of the
-    document: all <a href="#compound"><i>compound selectors</i></a> must
-    match elements within the scope. (The <a
+    document: all <a href="#compound-selector"><i>compound selectors</i></a>
+    must match elements within the scope. (The <a
     href="#roo-pseudo"><code>:root</code></a> pseudo-class, however, still
     only matches the actual root of the document.)
 
@@ -1236,9 +1238,9 @@ <h3 id=scoping><span class=secno>3.3. </span> Scoped Selectors</h3>
 
   <h3 id=pseudo-classes><span class=secno>3.4. </span> Pseudo-classes</h3>
 
-  <p>The pseudo-class concept is introduced to permit selection based on
-   information that lies outside of the document tree or that cannot be
-   expressed using the other simple selectors.
+  <p>The <dfn id=pseudo-class>pseudo-class</dfn> concept is introduced to
+   permit selection based on information that lies outside of the document
+   tree or that cannot be expressed using the other simple selectors.
 
   <p>A pseudo-class always consists of a &quot;colon&quot; (<code>:</code>)
    followed by the name of the pseudo-class and, for functional

selectors4/Overview.src.html

@@ -509,30 +509,30 @@ <h2 id="syntax">
 <h3 id="structure">
 Structure and Terminology</h3>
 
-  <p>The term <dfn id="selector">selector</dfn> can refer to a <i>simple selector</i>,
+  <p>The term <dfn>selector</dfn> can refer to a <i>simple selector</i>,
     <i>compound selector</i>, <i>complex selector</i>, or <i>selector list</i>.
 
-  <p>A <dfn id="complex">complex selector</dfn> is a chain of one
-  or more <a href="#compound">compound selectors</a>
-  separated by <a href="#combinators">combinators</a>.</p>
-
-  <p>A <dfn id="compound">compound selector</dfn>
-  is a chain of <a href="#simple">simple selectors</a>
-  that are not separated by a <a href="#combinators">combinator</a>. It
-  always begins with a <a href="#type-selectors">type selector</a> or a
-  (possibly implied) <a href="#universal-selector">universal selector</a>.
-  No other type selector or universal selector is allowed in the sequence.</p>
-
-  <p>A <dfn id="simple"><a
-  href="#simple">simple selector</a></dfn> is either a <a
-  href="#type-selectors">type selector</a>, <a
-  href="#universal-selector">universal selector</a>, <a
-  href="#attribute-selectors">attribute selector</a>, <a
-  href="#class-html">class selector</a>, <a
-  href="#id-selectors">ID selector</a>, or <a
-  href="#pseudo-classes">pseudo-class</a>.</p>
-
-  <p><dfn id="combinator">Combinators</dfn> are punctuation that represent a particular
+  <p>A <dfn>complex selector</dfn> is a chain of one
+  or more <i>compound selectors</i>
+  separated by <i>combinators</i>.
+
+  <p>A <dfn>compound selector</dfn>
+  is a chain of <i>simple selectors</i>
+  that are not separated by a <i>combinator</i>. It
+  always begins with a <i>type selector</i> or a
+  (possibly implied) <i>universal selector</i>.
+  No other type selector or universal selector is allowed in the sequence.
+
+  <p>
+    A <dfn id="simple">simple selector</dfn> is either a 
+    <i>type selector</i>, 
+    <i>universal selector</i>, 
+    <i>attribute selector</i>, 
+    <i>class selector</i>, 
+    <i>ID selector</i>, 
+    or <i>pseudo-class</i>.
+
+  <p>A <dfn>combinator</dfn> is punctuation that represents a particular
   kind of relationship between the compound selectors on either side.
   Combinators in Selectors level 4 include: whitespace, &quot;greater-than
   sign&quot; (U+003E, <code>&gt;</code>), &quot;plus sign&quot; (U+002B,
@@ -602,7 +602,7 @@ <h3 id="scoping">
 <h3 id="pseudo-classes">
 Pseudo-classes</h3>
 
-  <p>The pseudo-class concept is introduced to permit selection based on
+  <p>The <dfn>pseudo-class</dfn> concept is introduced to permit selection based on
   information that lies outside of the document tree or that cannot be
   expressed using the other simple selectors.</p>