[e] (0) Reorder the definitions and fix them so that they aren't cyclic.

Fixing http://www.w3.org/Bugs/Public/show_bug.cgi?id=13676

git-svn-id: http://svn.whatwg.org/webapps@6651 340c8d12-0b0e-0410-8428-c7bf67bfef74

complete.html

@@ -3367,22 +3367,22 @@ <h4 id=character-encodings><span class=secno>2.1.6 </span>Character encodings</h
   component of a <code>DOMString</code>. (This is a narrower
   definition than the one used in Unicode.) <a href=#refsWEBIDL>[WEBIDL]</a></p>
 
-  <p>The term <dfn id=unicode-character>Unicode character</dfn> is used to mean a <i title="">Unicode scalar value</i> (i.e. any Unicode code point that
-  is not a surrogate code point). <a href=#refsUNICODE>[UNICODE]</a></p>
-
-  <p>The term <dfn id=unicode-code-point>Unicode code point</dfn> means a <a href=#unicode-character>Unicode
-  character</a> where possible, and an isolated surrogate code
-  point when not. When a conformance requirement is defined in terms
-  of characters or Unicode code points, a pair of <a href=#code-unit title="code
-  unit">code units</a> consisting of a high surrogate followed by a
-  low surrogate must be treated as the single code point represented
-  by the surrogate pair, but isolated surrogates must each be treated
-  as the single code point with the value of the surrogate.</p>
+  <p>The term <dfn id=unicode-code-point>Unicode code point</dfn> means a <i title="">Unicode scalar value</i> where possible, and an isolated
+  surrogate code point when not. When a conformance requirement is
+  defined in terms of characters or Unicode code points, a pair of
+  <a href=#code-unit title="code unit">code units</a> consisting of a high
+  surrogate followed by a low surrogate must be treated as the single
+  code point represented by the surrogate pair, but isolated
+  surrogates must each be treated as the single code point with the
+  value of the surrogate. <a href=#refsUNICODE>[UNICODE]</a></p>
 
   <p>In this specification, the term <dfn id=character>character</dfn>, when not
   qualified as <em>Unicode</em> character, is synonymous with the term
   <a href=#unicode-code-point>Unicode code point</a>.</p>
 
+  <p>The term <dfn id=unicode-character>Unicode character</dfn> is used to mean a <i title="">Unicode scalar value</i> (i.e. any Unicode code point that
+  is not a surrogate code point). <a href=#refsUNICODE>[UNICODE]</a></p>
+
   <p>The <dfn id=code-point-length>code-point length</dfn> of a string is the number of
   <a href=#code-unit title="code unit">code units</a> in that string.</p>
 

index

@@ -3367,22 +3367,22 @@ a.setAttribute('href', 'http://example.com/'); // change the content attribute d
   component of a <code>DOMString</code>. (This is a narrower
   definition than the one used in Unicode.) <a href=#refsWEBIDL>[WEBIDL]</a></p>
 
-  <p>The term <dfn id=unicode-character>Unicode character</dfn> is used to mean a <i title="">Unicode scalar value</i> (i.e. any Unicode code point that
-  is not a surrogate code point). <a href=#refsUNICODE>[UNICODE]</a></p>
-
-  <p>The term <dfn id=unicode-code-point>Unicode code point</dfn> means a <a href=#unicode-character>Unicode
-  character</a> where possible, and an isolated surrogate code
-  point when not. When a conformance requirement is defined in terms
-  of characters or Unicode code points, a pair of <a href=#code-unit title="code
-  unit">code units</a> consisting of a high surrogate followed by a
-  low surrogate must be treated as the single code point represented
-  by the surrogate pair, but isolated surrogates must each be treated
-  as the single code point with the value of the surrogate.</p>
+  <p>The term <dfn id=unicode-code-point>Unicode code point</dfn> means a <i title="">Unicode scalar value</i> where possible, and an isolated
+  surrogate code point when not. When a conformance requirement is
+  defined in terms of characters or Unicode code points, a pair of
+  <a href=#code-unit title="code unit">code units</a> consisting of a high
+  surrogate followed by a low surrogate must be treated as the single
+  code point represented by the surrogate pair, but isolated
+  surrogates must each be treated as the single code point with the
+  value of the surrogate. <a href=#refsUNICODE>[UNICODE]</a></p>
 
   <p>In this specification, the term <dfn id=character>character</dfn>, when not
   qualified as <em>Unicode</em> character, is synonymous with the term
   <a href=#unicode-code-point>Unicode code point</a>.</p>
 
+  <p>The term <dfn id=unicode-character>Unicode character</dfn> is used to mean a <i title="">Unicode scalar value</i> (i.e. any Unicode code point that
+  is not a surrogate code point). <a href=#refsUNICODE>[UNICODE]</a></p>
+
   <p>The <dfn id=code-point-length>code-point length</dfn> of a string is the number of
   <a href=#code-unit title="code unit">code units</a> in that string.</p>
 

source

@@ -2243,24 +2243,25 @@ a.setAttribute('href', 'http://example.com/'); // change the content attribute d
   definition than the one used in Unicode.) <a
   href="#refsWEBIDL">[WEBIDL]</a></p>
 
-  <p>The term <dfn>Unicode character</dfn> is used to mean a <i
-  title="">Unicode scalar value</i> (i.e. any Unicode code point that
-  is not a surrogate code point). <a
-  href="#refsUNICODE">[UNICODE]</a></p>
-
-  <p>The term <dfn>Unicode code point</dfn> means a <span>Unicode
-  character</span> where possible, and an isolated surrogate code
-  point when not. When a conformance requirement is defined in terms
-  of characters or Unicode code points, a pair of <span title="code
-  unit">code units</span> consisting of a high surrogate followed by a
-  low surrogate must be treated as the single code point represented
-  by the surrogate pair, but isolated surrogates must each be treated
-  as the single code point with the value of the surrogate.</p>
+  <p>The term <dfn>Unicode code point</dfn> means a <i
+  title="">Unicode scalar value</i> where possible, and an isolated
+  surrogate code point when not. When a conformance requirement is
+  defined in terms of characters or Unicode code points, a pair of
+  <span title="code unit">code units</span> consisting of a high
+  surrogate followed by a low surrogate must be treated as the single
+  code point represented by the surrogate pair, but isolated
+  surrogates must each be treated as the single code point with the
+  value of the surrogate. <a href="#refsUNICODE">[UNICODE]</a></p>
 
   <p>In this specification, the term <dfn>character</dfn>, when not
   qualified as <em>Unicode</em> character, is synonymous with the term
   <span>Unicode code point</span>.</p>
 
+  <p>The term <dfn>Unicode character</dfn> is used to mean a <i
+  title="">Unicode scalar value</i> (i.e. any Unicode code point that
+  is not a surrogate code point). <a
+  href="#refsUNICODE">[UNICODE]</a></p>
+
   <p>The <dfn>code-point length</dfn> of a string is the number of
   <span title="code unit">code units</span> in that string.</p>