[html5] r8665 - [e] (0) Rename 'list marker' and 'scope marker' to just 'marker' for consistency [...]

whatwg at whatwg.org whatwg at whatwg.org
Sun Jun 8 22:43:52 PDT 2014


Author: ianh
Date: 2014-06-08 22:43:49 -0700 (Sun, 08 Jun 2014)
New Revision: 8665

Modified:
   complete.html
   index
   source
Log:
[e] (0) Rename 'list marker' and 'scope marker' to just 'marker' for consistency and clarity, and cross-reference them all
Affected topics: HTML Syntax and Parsing

Modified: complete.html
===================================================================
--- complete.html	2014-06-08 16:49:57 UTC (rev 8664)
+++ complete.html	2014-06-09 05:43:49 UTC (rev 8665)
@@ -290,7 +290,7 @@
   </script><body onload=init()>
   <header class="head with-buttons" id=head><p><a href=//www.whatwg.org/ class=logo><img width=101 src=/images/logo alt=WHATWG height=101></a></p>
    <hgroup><h1 class=allcaps>HTML</h1>
-    <h2 class="no-num no-toc">Living Standard — Last Updated 8 June 2014</h2>
+    <h2 class="no-num no-toc">Living Standard — Last Updated 9 June 2014</h2>
    </hgroup><div>
     <div>
      <a href=//whatwg.org/html><span><strong>Multipage Version</strong> <code>whatwg.org/html</code></span></a>
@@ -90770,7 +90770,8 @@
     from the following list:</p>
 
     <dl class=switch><dt>If <a href=#foster-parent title="foster parent">foster parenting</a> is enabled and <var title="">target</var> is a <code><a href=#the-table-element>table</a></code>, <code><a href=#the-tbody-element>tbody</a></code>, <code><a href=#the-tfoot-element>tfoot</a></code>,
-     <code><a href=#the-thead-element>thead</a></code>, or <code><a href=#the-tr-element>tr</a></code> element</dt>
+     <code><a href=#the-thead-element>thead</a></code>, or <code><a href=#the-tr-element>tr</a></code> element</dt> <!-- same list as handling of characters
+     in "in table" mode -->
 
      <dd>
 
@@ -93225,7 +93226,7 @@
   <p>When the user agent is to apply the rules for the "<a href=#parsing-main-intable title="insertion mode: in table">in
   table</a>" <a href=#insertion-mode>insertion mode</a>, the user agent must handle the token as follows:</p>
 
-  <dl class=switch><dt>A character token, if the <a href=#current-node>current node</a> is <code><a href=#the-table-element>table</a></code>, <code><a href=#the-tbody-element>tbody</a></code>, <code><a href=#the-tfoot-element>tfoot</a></code>, <code><a href=#the-thead-element>thead</a></code>, or <code><a href=#the-tr-element>tr</a></code> element</dt>
+  <dl class=switch><dt>A character token, if the <a href=#current-node>current node</a> is <code><a href=#the-table-element>table</a></code>, <code><a href=#the-tbody-element>tbody</a></code>, <code><a href=#the-tfoot-element>tfoot</a></code>, <code><a href=#the-thead-element>thead</a></code>, or <code><a href=#the-tr-element>tr</a></code> element</dt> <!-- same list as foster parenting -->
    <dd>
 
      <p>Let the <dfn id=pending-table-character-tokens><var>pending table character tokens</var></dfn> be an empty list of tokens.</p>
@@ -93422,6 +93423,9 @@
   <code><a href=#the-template-element>template</a></code>, or <code><a href=#the-html-element>html</a></code> element, pop elements from the <a href=#stack-of-open-elements>stack of open
   elements</a>.</p>
 
+  <p class=note>This is the same list of elements as used in the <i><a href=#has-an-element-in-table-scope>has an element in table
+  scope</a></i> steps.</p>
+
   <p class=note>The <a href=#current-node>current node</a> being an <code><a href=#the-html-element>html</a></code> element after this
   process is a <a href=#fragment-case>fragment case</a>.</p>
 
@@ -93454,8 +93458,9 @@
 
     <!-- this can only be called if the current node is one of the table model elements -->
 
+<!--CLEANUP-->
     <p>If any of the tokens in the <var><a href=#pending-table-character-tokens>pending table character tokens</a></var> list are character
-    tokens that are not <a href=#space-character title="space character">space characters</a>, then reprocess the
+    tokens that are not <a href=#space-character title="space character">space characters</a>, then this is a <a href=#parse-error>parse error</a>: reprocess the
     character tokens in the <var><a href=#pending-table-character-tokens>pending table character tokens</a></var> list using the rules given in
     the "anything else" entry in the "<a href=#parsing-main-intable title="insertion mode: in table">in table</a>"
     insertion mode.</p>

Modified: index
===================================================================
--- index	2014-06-08 16:49:57 UTC (rev 8664)
+++ index	2014-06-09 05:43:49 UTC (rev 8665)
@@ -290,7 +290,7 @@
   </script><body onload=init()>
   <header class="head with-buttons" id=head><p><a href=//www.whatwg.org/ class=logo><img width=101 src=/images/logo alt=WHATWG height=101></a></p>
    <hgroup><h1 class=allcaps>HTML</h1>
-    <h2 class="no-num no-toc">Living Standard — Last Updated 8 June 2014</h2>
+    <h2 class="no-num no-toc">Living Standard — Last Updated 9 June 2014</h2>
    </hgroup><div>
     <div>
      <a href=//whatwg.org/html><span><strong>Multipage Version</strong> <code>whatwg.org/html</code></span></a>
@@ -90770,7 +90770,8 @@
     from the following list:</p>
 
     <dl class=switch><dt>If <a href=#foster-parent title="foster parent">foster parenting</a> is enabled and <var title="">target</var> is a <code><a href=#the-table-element>table</a></code>, <code><a href=#the-tbody-element>tbody</a></code>, <code><a href=#the-tfoot-element>tfoot</a></code>,
-     <code><a href=#the-thead-element>thead</a></code>, or <code><a href=#the-tr-element>tr</a></code> element</dt>
+     <code><a href=#the-thead-element>thead</a></code>, or <code><a href=#the-tr-element>tr</a></code> element</dt> <!-- same list as handling of characters
+     in "in table" mode -->
 
      <dd>
 
@@ -93225,7 +93226,7 @@
   <p>When the user agent is to apply the rules for the "<a href=#parsing-main-intable title="insertion mode: in table">in
   table</a>" <a href=#insertion-mode>insertion mode</a>, the user agent must handle the token as follows:</p>
 
-  <dl class=switch><dt>A character token, if the <a href=#current-node>current node</a> is <code><a href=#the-table-element>table</a></code>, <code><a href=#the-tbody-element>tbody</a></code>, <code><a href=#the-tfoot-element>tfoot</a></code>, <code><a href=#the-thead-element>thead</a></code>, or <code><a href=#the-tr-element>tr</a></code> element</dt>
+  <dl class=switch><dt>A character token, if the <a href=#current-node>current node</a> is <code><a href=#the-table-element>table</a></code>, <code><a href=#the-tbody-element>tbody</a></code>, <code><a href=#the-tfoot-element>tfoot</a></code>, <code><a href=#the-thead-element>thead</a></code>, or <code><a href=#the-tr-element>tr</a></code> element</dt> <!-- same list as foster parenting -->
    <dd>
 
      <p>Let the <dfn id=pending-table-character-tokens><var>pending table character tokens</var></dfn> be an empty list of tokens.</p>
@@ -93422,6 +93423,9 @@
   <code><a href=#the-template-element>template</a></code>, or <code><a href=#the-html-element>html</a></code> element, pop elements from the <a href=#stack-of-open-elements>stack of open
   elements</a>.</p>
 
+  <p class=note>This is the same list of elements as used in the <i><a href=#has-an-element-in-table-scope>has an element in table
+  scope</a></i> steps.</p>
+
   <p class=note>The <a href=#current-node>current node</a> being an <code><a href=#the-html-element>html</a></code> element after this
   process is a <a href=#fragment-case>fragment case</a>.</p>
 
@@ -93454,8 +93458,9 @@
 
     <!-- this can only be called if the current node is one of the table model elements -->
 
+<!--CLEANUP-->
     <p>If any of the tokens in the <var><a href=#pending-table-character-tokens>pending table character tokens</a></var> list are character
-    tokens that are not <a href=#space-character title="space character">space characters</a>, then reprocess the
+    tokens that are not <a href=#space-character title="space character">space characters</a>, then this is a <a href=#parse-error>parse error</a>: reprocess the
     character tokens in the <var><a href=#pending-table-character-tokens>pending table character tokens</a></var> list using the rules given in
     the "anything else" entry in the "<a href=#parsing-main-intable title="insertion mode: in table">in table</a>"
     insertion mode.</p>

Modified: source
===================================================================
--- source	2014-06-08 16:49:57 UTC (rev 8664)
+++ source	2014-06-09 05:43:49 UTC (rev 8665)
@@ -100119,7 +100119,8 @@
 
      <dt>If <span data-x="foster parent">foster parenting</span> is enabled and <var
      data-x="">target</var> is a <code>table</code>, <code>tbody</code>, <code>tfoot</code>,
-     <code>thead</code>, or <code>tr</code> element</dt>
+     <code>thead</code>, or <code>tr</code> element</dt> <!-- same list as handling of characters
+     in "in table" mode -->
 
      <dd>
 
@@ -102860,7 +102861,7 @@
 
   <dl class="switch">
 
-   <dt>A character token, if the <span>current node</span> is <code>table</code>, <code>tbody</code>, <code>tfoot</code>, <code>thead</code>, or <code>tr</code> element</dt>
+   <dt>A character token, if the <span>current node</span> is <code>table</code>, <code>tbody</code>, <code>tfoot</code>, <code>thead</code>, or <code>tr</code> element</dt> <!-- same list as foster parenting -->
    <dd>
 
      <p>Let the <dfn><var>pending table character tokens</var></dfn> be an empty list of tokens.</p>
@@ -103062,6 +103063,9 @@
   <code>template</code>, or <code>html</code> element, pop elements from the <span>stack of open
   elements</span>.</p>
 
+  <p class="note">This is the same list of elements as used in the <i>has an element in table
+  scope</i> steps.</p>
+
   <p class="note">The <span>current node</span> being an <code>html</code> element after this
   process is a <span>fragment case</span>.</p>
 
@@ -103096,8 +103100,9 @@
 
     <!-- this can only be called if the current node is one of the table model elements -->
 
+<!--CLEANUP-->
     <p>If any of the tokens in the <var>pending table character tokens</var> list are character
-    tokens that are not <span data-x="space character">space characters</span>, then reprocess the
+    tokens that are not <span data-x="space character">space characters</span>, then this is a <span>parse error</span>: reprocess the
     character tokens in the <var>pending table character tokens</var> list using the rules given in
     the "anything else" entry in the "<span data-x="insertion mode: in table">in table</span>"
     insertion mode.</p>



More information about the Commit-Watchers mailing list