[e] (0) Rename an insertion mode to prepare for more tokenizer modes.

git-svn-id: http://svn.whatwg.org/webapps@4176 340c8d12-0b0e-0410-8428-c7bf67bfef74
whatwg · Oct 19, 2009 · 3fd8109 · 3fd8109
1 parent 28891bc
commit 3fd8109
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 42 deletions.
diff --git a/complete.html b/complete.html
@@ -1105,7 +1105,7 @@ <h2 class="no-num no-toc" id=contents>Table of contents</h2>
        <li><a href=#parsing-main-inheadnoscript><span class=secno>11.2.5.8 </span>The "in head noscript" insertion mode</a></li>
        <li><a href=#the-after-head-insertion-mode><span class=secno>11.2.5.9 </span>The "after head" insertion mode</a></li>
        <li><a href=#parsing-main-inbody><span class=secno>11.2.5.10 </span>The "in body" insertion mode</a></li>
-       <li><a href=#parsing-main-incdata><span class=secno>11.2.5.11 </span>The "in RAWTEXT/RCDATA" insertion mode</a></li>
+       <li><a href=#parsing-main-incdata><span class=secno>11.2.5.11 </span>The "text" insertion mode</a></li>
        <li><a href=#parsing-main-intable><span class=secno>11.2.5.12 </span>The "in table" insertion mode</a></li>
        <li><a href=#parsing-main-intabletext><span class=secno>11.2.5.13 </span>The "in table text" insertion mode</a></li>
        <li><a href=#parsing-main-incaption><span class=secno>11.2.5.14 </span>The "in caption" insertion mode</a></li>
@@ -69937,7 +69937,7 @@ <h5 id=the-insertion-mode><span class=secno>11.2.3.1 </span>The insertion mode</
   "<a href=#the-before-html-insertion-mode title="insertion mode: before html">before html</a>",
   "<a href=#the-before-head-insertion-mode title="insertion mode: before head">before head</a>",
   "<a href=#parsing-main-inhead title="insertion mode: in head">in head</a>", "<a href=#parsing-main-inheadnoscript title="insertion mode: in head noscript">in head noscript</a>",
-  "<a href=#the-after-head-insertion-mode title="insertion mode: after head">after head</a>", "<a href=#parsing-main-inbody title="insertion mode: in body">in body</a>", "<a href=#parsing-main-incdata title="insertion mode: in RAWTEXT/RCDATA">in RAWTEXT/RCDATA</a>",
+  "<a href=#the-after-head-insertion-mode title="insertion mode: after head">after head</a>", "<a href=#parsing-main-inbody title="insertion mode: in body">in body</a>", "<a href=#parsing-main-incdata title="insertion mode: text">text</a>",
   "<a href=#parsing-main-intable title="insertion mode: in table">in table</a>", "<a href=#parsing-main-intabletext title="insertion mode: in table text">in table text</a>", "<a href=#parsing-main-incaption title="insertion mode: in caption">in caption</a>", "<a href=#parsing-main-incolgroup title="insertion mode: in column group">in column group</a>",
   "<a href=#parsing-main-intbody title="insertion mode: in table body">in table body</a>",
   "<a href=#parsing-main-intr title="insertion mode: in row">in row</a>", "<a href=#parsing-main-intd title="insertion mode: in cell">in cell</a>", "<a href=#parsing-main-inselect title="insertion mode: in select">in select</a>", "<a href=#parsing-main-inselectintable title="insertion mode: in select in table">in select in
@@ -69968,9 +69968,10 @@ <h5 id=the-insertion-mode><span class=secno>11.2.3.1 </span>The insertion mode</
   to a new value.</p>
 
   <p>When the insertion mode is switched to "<a href=#parsing-main-incdata title="insertion
-  mode: in RAWTEXT/RCDATA">in RAWTEXT/RCDATA</a>" or "<a href=#parsing-main-intabletext title="insertion mode: in table text">in table text</a>", the
-  <dfn id=original-insertion-mode>original insertion mode</dfn> is also set. This is the
-  insertion mode to which the tree construction stage will return.</p>
+  mode: text">text</a>" or "<a href=#parsing-main-intabletext title="insertion mode: in table
+  text">in table text</a>", the <dfn id=original-insertion-mode>original insertion mode</dfn>
+  is also set. This is the insertion mode to which the tree
+  construction stage will return.</p>
 
   <p>When the insertion mode is switched to "<a href=#parsing-main-inforeign title="insertion
   mode: in foreign content">in foreign content</a>", the
@@ -72080,8 +72081,7 @@ <h5 id=creating-and-inserting-elements><span class=secno>11.2.5.1 </span>Creatin
    <li><p>Let the <a href=#original-insertion-mode>original insertion mode</a> be the current
    <a href=#insertion-mode>insertion mode</a>.</p>
 
-   <li><p>Then, switch the <a href=#insertion-mode>insertion mode</a> to "<a href=#parsing-main-incdata title="insertion mode: in RAWTEXT/RCDATA">in
-   RAWTEXT/RCDATA</a>".</li>
+   <li><p>Then, switch the <a href=#insertion-mode>insertion mode</a> to "<a href=#parsing-main-incdata title="insertion mode: text">text</a>".</li>
 
   </ol><h5 id=closing-elements-that-have-implied-end-tags><span class=secno>11.2.5.2 </span>Closing elements that have implied end tags</h5>
 
@@ -72596,8 +72596,7 @@ <h5 id=the-before-head-insertion-mode><span class=secno>11.2.5.6 </span>The "<df
      <li><p>Let the <a href=#original-insertion-mode>original insertion mode</a> be the current
      <a href=#insertion-mode>insertion mode</a>.</p>
 
-     <li><p>Switch the <a href=#insertion-mode>insertion mode</a> to "<a href=#parsing-main-incdata title="insertion mode: in RAWTEXT/RCDATA">in
-     RAWTEXT/RCDATA</a>".</li>
+     <li><p>Switch the <a href=#insertion-mode>insertion mode</a> to "<a href=#parsing-main-incdata title="insertion mode: text">text</a>".</li>
 
     </ol></dd>
 
@@ -73743,8 +73742,7 @@ <h5 id=the-before-head-insertion-mode><span class=secno>11.2.5.6 </span>The "<df
      <li><p>Set the <a href=#frameset-ok-flag>frameset-ok flag</a> to "not
      ok".</li>
 
-     <li><p>Switch the <a href=#insertion-mode>insertion mode</a> to "<a href=#parsing-main-incdata title="insertion mode: in RAWTEXT/RCDATA">in
-     RAWTEXT/RCDATA</a>".</li>
+     <li><p>Switch the <a href=#insertion-mode>insertion mode</a> to "<a href=#parsing-main-incdata title="insertion mode: text">text</a>".</li>
 
     </ol></dd>
 
@@ -73996,11 +73994,10 @@ <h5 id=the-before-head-insertion-mode><span class=secno>11.2.5.6 </span>The "<df
 
     </ol></dd>
 
-  </dl><h5 id=parsing-main-incdata><span class=secno>11.2.5.11 </span>The "<dfn title="insertion mode: in RAWTEXT/RCDATA">in RAWTEXT/RCDATA</dfn>" insertion mode</h5>
+  </dl><h5 id=parsing-main-incdata><span class=secno>11.2.5.11 </span>The "<dfn title="insertion mode: text">text</dfn>" insertion mode</h5>
 
   <p>When the <a href=#insertion-mode>insertion mode</a> is "<a href=#parsing-main-incdata title="insertion
-  mode: in RAWTEXT/RCDATA">in RAWTEXT/RCDATA</a>", tokens must be
-  handled as follows:</p>
+  mode: text">text</a>", tokens must be handled as follows:</p>
 
   <dl class=switch><dt>A character token</dt>
    <dd>

diff --git a/index b/index
@@ -934,7 +934,7 @@
        <li><a href=#parsing-main-inheadnoscript><span class=secno>9.2.5.8 </span>The "in head noscript" insertion mode</a></li>
        <li><a href=#the-after-head-insertion-mode><span class=secno>9.2.5.9 </span>The "after head" insertion mode</a></li>
        <li><a href=#parsing-main-inbody><span class=secno>9.2.5.10 </span>The "in body" insertion mode</a></li>
-       <li><a href=#parsing-main-incdata><span class=secno>9.2.5.11 </span>The "in RAWTEXT/RCDATA" insertion mode</a></li>
+       <li><a href=#parsing-main-incdata><span class=secno>9.2.5.11 </span>The "text" insertion mode</a></li>
        <li><a href=#parsing-main-intable><span class=secno>9.2.5.12 </span>The "in table" insertion mode</a></li>
        <li><a href=#parsing-main-intabletext><span class=secno>9.2.5.13 </span>The "in table text" insertion mode</a></li>
        <li><a href=#parsing-main-incaption><span class=secno>9.2.5.14 </span>The "in caption" insertion mode</a></li>
@@ -60995,7 +60995,7 @@ interface <dfn id=messageport>MessagePort</dfn> {
   "<a href=#the-before-html-insertion-mode title="insertion mode: before html">before html</a>",
   "<a href=#the-before-head-insertion-mode title="insertion mode: before head">before head</a>",
   "<a href=#parsing-main-inhead title="insertion mode: in head">in head</a>", "<a href=#parsing-main-inheadnoscript title="insertion mode: in head noscript">in head noscript</a>",
-  "<a href=#the-after-head-insertion-mode title="insertion mode: after head">after head</a>", "<a href=#parsing-main-inbody title="insertion mode: in body">in body</a>", "<a href=#parsing-main-incdata title="insertion mode: in RAWTEXT/RCDATA">in RAWTEXT/RCDATA</a>",
+  "<a href=#the-after-head-insertion-mode title="insertion mode: after head">after head</a>", "<a href=#parsing-main-inbody title="insertion mode: in body">in body</a>", "<a href=#parsing-main-incdata title="insertion mode: text">text</a>",
   "<a href=#parsing-main-intable title="insertion mode: in table">in table</a>", "<a href=#parsing-main-intabletext title="insertion mode: in table text">in table text</a>", "<a href=#parsing-main-incaption title="insertion mode: in caption">in caption</a>", "<a href=#parsing-main-incolgroup title="insertion mode: in column group">in column group</a>",
   "<a href=#parsing-main-intbody title="insertion mode: in table body">in table body</a>",
   "<a href=#parsing-main-intr title="insertion mode: in row">in row</a>", "<a href=#parsing-main-intd title="insertion mode: in cell">in cell</a>", "<a href=#parsing-main-inselect title="insertion mode: in select">in select</a>", "<a href=#parsing-main-inselectintable title="insertion mode: in select in table">in select in
@@ -61026,9 +61026,10 @@ interface <dfn id=messageport>MessagePort</dfn> {
   to a new value.</p>
 
   <p>When the insertion mode is switched to "<a href=#parsing-main-incdata title="insertion
-  mode: in RAWTEXT/RCDATA">in RAWTEXT/RCDATA</a>" or "<a href=#parsing-main-intabletext title="insertion mode: in table text">in table text</a>", the
-  <dfn id=original-insertion-mode>original insertion mode</dfn> is also set. This is the
-  insertion mode to which the tree construction stage will return.</p>
+  mode: text">text</a>" or "<a href=#parsing-main-intabletext title="insertion mode: in table
+  text">in table text</a>", the <dfn id=original-insertion-mode>original insertion mode</dfn>
+  is also set. This is the insertion mode to which the tree
+  construction stage will return.</p>
 
   <p>When the insertion mode is switched to "<a href=#parsing-main-inforeign title="insertion
   mode: in foreign content">in foreign content</a>", the
@@ -63138,8 +63139,7 @@ document.body.appendChild(text);
    <li><p>Let the <a href=#original-insertion-mode>original insertion mode</a> be the current
    <a href=#insertion-mode>insertion mode</a>.</p>
 
-   <li><p>Then, switch the <a href=#insertion-mode>insertion mode</a> to "<a href=#parsing-main-incdata title="insertion mode: in RAWTEXT/RCDATA">in
-   RAWTEXT/RCDATA</a>".</li>
+   <li><p>Then, switch the <a href=#insertion-mode>insertion mode</a> to "<a href=#parsing-main-incdata title="insertion mode: text">text</a>".</li>
 
   </ol><h5 id=closing-elements-that-have-implied-end-tags><span class=secno>9.2.5.2 </span>Closing elements that have implied end tags</h5>
 
@@ -63654,8 +63654,7 @@ document.body.appendChild(text);
      <li><p>Let the <a href=#original-insertion-mode>original insertion mode</a> be the current
      <a href=#insertion-mode>insertion mode</a>.</p>
 
-     <li><p>Switch the <a href=#insertion-mode>insertion mode</a> to "<a href=#parsing-main-incdata title="insertion mode: in RAWTEXT/RCDATA">in
-     RAWTEXT/RCDATA</a>".</li>
+     <li><p>Switch the <a href=#insertion-mode>insertion mode</a> to "<a href=#parsing-main-incdata title="insertion mode: text">text</a>".</li>
 
     </ol></dd>
 
@@ -64801,8 +64800,7 @@ document.body.appendChild(text);
      <li><p>Set the <a href=#frameset-ok-flag>frameset-ok flag</a> to "not
      ok".</li>
 
-     <li><p>Switch the <a href=#insertion-mode>insertion mode</a> to "<a href=#parsing-main-incdata title="insertion mode: in RAWTEXT/RCDATA">in
-     RAWTEXT/RCDATA</a>".</li>
+     <li><p>Switch the <a href=#insertion-mode>insertion mode</a> to "<a href=#parsing-main-incdata title="insertion mode: text">text</a>".</li>
 
     </ol></dd>
 
@@ -65054,11 +65052,10 @@ document.body.appendChild(text);
 
     </ol></dd>
 
-  </dl><h5 id=parsing-main-incdata><span class=secno>9.2.5.11 </span>The "<dfn title="insertion mode: in RAWTEXT/RCDATA">in RAWTEXT/RCDATA</dfn>" insertion mode</h5>
+  </dl><h5 id=parsing-main-incdata><span class=secno>9.2.5.11 </span>The "<dfn title="insertion mode: text">text</dfn>" insertion mode</h5>
 
   <p>When the <a href=#insertion-mode>insertion mode</a> is "<a href=#parsing-main-incdata title="insertion
-  mode: in RAWTEXT/RCDATA">in RAWTEXT/RCDATA</a>", tokens must be
-  handled as follows:</p>
+  mode: text">text</a>", tokens must be handled as follows:</p>
 
   <dl class=switch><dt>A character token</dt>
    <dd>

diff --git a/source b/source
@@ -78723,7 +78723,7 @@ interface <dfn>MessagePort</dfn> {
   title="insertion mode: in head noscript">in head noscript</span>",
   "<span title="insertion mode: after head">after head</span>", "<span
   title="insertion mode: in body">in body</span>", "<span
-  title="insertion mode: in RAWTEXT/RCDATA">in RAWTEXT/RCDATA</span>",
+  title="insertion mode: text">text</span>",
   "<span title="insertion mode: in table">in table</span>", "<span
   title="insertion mode: in table text">in table text</span>", "<span
   title="insertion mode: in caption">in caption</span>", "<span
@@ -78763,10 +78763,10 @@ interface <dfn>MessagePort</dfn> {
   to a new value.</p>
 
   <p>When the insertion mode is switched to "<span title="insertion
-  mode: in RAWTEXT/RCDATA">in RAWTEXT/RCDATA</span>" or "<span
-  title="insertion mode: in table text">in table text</span>", the
-  <dfn>original insertion mode</dfn> is also set. This is the
-  insertion mode to which the tree construction stage will return.</p>
+  mode: text">text</span>" or "<span title="insertion mode: in table
+  text">in table text</span>", the <dfn>original insertion mode</dfn>
+  is also set. This is the insertion mode to which the tree
+  construction stage will return.</p>
 
   <p>When the insertion mode is switched to "<span title="insertion
   mode: in foreign content">in foreign content</span>", the
@@ -81172,8 +81172,7 @@ document.body.appendChild(text);
    <span>insertion mode</span>.</p>
 
    <li><p>Then, switch the <span>insertion mode</span> to "<span
-   title="insertion mode: in RAWTEXT/RCDATA">in
-   RAWTEXT/RCDATA</span>".</p></li>
+   title="insertion mode: text">text</span>".</p></li>
 
   </ol>
 
@@ -81752,8 +81751,7 @@ document.body.appendChild(text);
      <span>insertion mode</span>.</p>
 
      <li><p>Switch the <span>insertion mode</span> to "<span
-     title="insertion mode: in RAWTEXT/RCDATA">in
-     RAWTEXT/RCDATA</span>".</p></li>
+     title="insertion mode: text">text</span>".</p></li>
 
     </ol>
 
@@ -83002,8 +83000,7 @@ document.body.appendChild(text);
      ok".</p></li>
 
      <li><p>Switch the <span>insertion mode</span> to "<span
-     title="insertion mode: in RAWTEXT/RCDATA">in
-     RAWTEXT/RCDATA</span>".</p></li>
+     title="insertion mode: text">text</span>".</p></li>
 
     </ol>
 
@@ -83273,11 +83270,10 @@ document.body.appendChild(text);
 
 
 
-  <h5 id="parsing-main-incdata">The "<dfn title="insertion mode: in RAWTEXT/RCDATA">in RAWTEXT/RCDATA</dfn>" insertion mode</h5>
+  <h5 id="parsing-main-incdata">The "<dfn title="insertion mode: text">text</dfn>" insertion mode</h5>
 
   <p>When the <span>insertion mode</span> is "<span title="insertion
-  mode: in RAWTEXT/RCDATA">in RAWTEXT/RCDATA</span>", tokens must be
-  handled as follows:</p>
+  mode: text">text</span>", tokens must be handled as follows:</p>
 
   <dl class="switch">