<caption>, <colgroup> (incomplete); move a paragraph down in the stru…

…cture section to use terms after it defines them; s/zore/zero/ git-svn-id: http://svn.whatwg.org/webapps@278 340c8d12-0b0e-0410-8428-c7bf67bfef74
whatwg · Nov 10, 2006 · c69186a · c69186a
1 parent 3e91ad3
commit c69186a
Show file tree

Hide file tree

Showing 2 changed files with 184 additions and 48 deletions.
diff --git a/index b/index
@@ -528,6 +528,12 @@
       <ul class=toc>
        <li><a href="#the-table"><span class=secno>3.13.1. </span>The <dfn
         id=table><code>table</code></dfn> element</a>
+
+       <li><a href="#the-caption"><span class=secno>3.13.2. </span>The <dfn
+        id=caption><code>caption</code></dfn> element</a>
+
+       <li><a href="#the-colgroup"><span class=secno>3.13.3. </span>The <dfn
+        id=colgroup><code>colgroup</code></dfn> element</a>
       </ul>
 
      <li><a href="#forms"><span class=secno>3.14. </span>Forms <span
@@ -5426,17 +5432,17 @@ http://software.hixie.ch/utilities/js/live-dom-viewer/?%3C%21DOCTYPE%20html%3E..
     href="#table0">table</a></code>.
   </dl>
 
-  <p>Unless an element's content model explicitly states that it must contain
-   <a href="#significant">significant inline content</a>, simply having no
-   text nodes and no elements satisfies an element whose content model is
-   some kind of inline content.
-
   <p>Some elements are defined to have as a content model <dfn
    id=significant>significant inline content</dfn>. This means that at least
    one descendant of the element must be <a href="#significant0">significant
    text</a> or <a href="#embedded1">embedded content</a>.</p>
   <!-- XXX links -->
 
+  <p>Unless an element's content model explicitly states that it must contain
+   <a href="#significant">significant inline content</a>, simply having no
+   text nodes and no elements satisfies an element whose content model is
+   some kind of inline content.
+
   <p><dfn id=significant0>Significant text</dfn>, for the purposes of
    determining the presence of <a href="#significant">significant inline
    content</a>, consists of any character other than those falling in the <a
@@ -10369,11 +10375,12 @@ Address: &lt;input name="address"&gt;&lt;/p&gt;</pre>
 
    <dt>Content model:
 
-   <dd>In this order: optionally a <code>caption</code> element, followed by
-    either zero or more <code>colgroup</code> elements <em>or</em> one or
-    more <code>col</code> elements, followed optionally by a
+   <dd>In this order: optionally a <code><a
+    href="#caption1">caption</a></code> element, followed by either zero or
+    more <code><a href="#colgroup0">colgroup</a></code> elements <em>or</em>
+    one or more <code>col</code> elements, followed optionally by a
     <code>thead</code> element, followed optionally by a <code>tfoot</code>
-    element, followed by either zore or more <code>tbody</code> elements
+    element, followed by either zero or more <code>tbody</code> elements
     <em>or</em> one or more <code>tr</code> elements, followed optionally by
     a <code>tfoot</code> element (but there can only be one
     <code>tfoot</code> element child in total).
@@ -10387,7 +10394,7 @@ Address: &lt;input name="address"&gt;&lt;/p&gt;</pre>
    <dd>
     <pre
      class=idl>interface <dfn id=htmltableelement>HTMLTableElement</dfn> : <a href="#htmlelement">HTMLElement</a> {
-           attribute <span>HTMLTableCaptionElement</span> <a href="#caption" title=dom-table-caption>caption</a>;
+           attribute <span>HTMLTableCaptionElement</span> <a href="#caption0" title=dom-table-caption>caption</a>;
   HTMLElement <a href="#createcaption" title=dom-table-createCaption>createCaption</a>();
   void <a href="#deletecaption" title=dom-table-deleteCaption>deleteCaption</a>();
            attribute <span>HTMLTableSectionElement</span> <a href="#thead" title=dom-table-tHead>tHead</a>;
@@ -10411,13 +10418,14 @@ Address: &lt;input name="address"&gt;&lt;/p&gt;</pre>
 
   <ol>
    <li>
-    <p>Zero or one <code>caption</code> elements.
+    <p>Zero or one <code><a href="#caption1">caption</a></code> elements.
 
    <li>
     <p>Either:</p>
 
     <ul>
-     <li>Zero or more <code>colgroup</code> elements, or
+     <li>Zero or more <code><a href="#colgroup0">colgroup</a></code>
+      elements, or
 
      <li>One or more <code>col</code> elements.
     </ul>
@@ -10440,22 +10448,23 @@ Address: &lt;input name="address"&gt;&lt;/p&gt;</pre>
     elements in the table.
   </ol>
 
-  <p>The <dfn id=caption title=dom-table-caption><code>caption</code></dfn>
-   DOM attribute must return, on getting, the first <code>caption</code>
-   element child of the <code><a href="#table0">table</a></code> element. On
-   setting, the first <code>caption</code> element child of the <code><a
+  <p>The <dfn id=caption0 title=dom-table-caption><code>caption</code></dfn>
+   DOM attribute must return, on getting, the first <code><a
+   href="#caption1">caption</a></code> element child of the <code><a
+   href="#table0">table</a></code> element. On setting, the first <code><a
+   href="#caption1">caption</a></code> element child of the <code><a
    href="#table0">table</a></code> element, if any, must be removed, and the
    new value must be inserted as the first node of the <code><a
    href="#table0">table</a></code> element.
 
   <p>The <dfn id=createcaption
    title=dom-table-createCaption><code>createCaption()</code></dfn> method
-   must return a new <code>caption</code> element.
+   must return a new <code><a href="#caption1">caption</a></code> element.
 
   <p>The <dfn id=deletecaption
    title=dom-table-deleteCaption><code>deleteCaption()</code></dfn> method
-   must remove the first <code>caption</code> element child of the <code><a
-   href="#table0">table</a></code> element, if any.
+   must remove the first <code><a href="#caption1">caption</a></code> element
+   child of the <code><a href="#table0">table</a></code> element, if any.
 
   <p>The <dfn id=thead title=dom-table-tHead><code>tHead</code></dfn> DOM
    attribute must return, on getting, the first <code>thead</code> element
@@ -10464,8 +10473,9 @@ Address: &lt;input name="address"&gt;&lt;/p&gt;</pre>
    href="#table0">table</a></code> element, if any, must be removed, and the
    new value must be inserted immediately before the first element in the
    <code><a href="#table0">table</a></code> element that is neither a
-   <code>caption</code> element, a <code>colgroup</code> element, nor a
-   <code>col</code> element.
+   <code><a href="#caption1">caption</a></code> element, a <code><a
+   href="#colgroup0">colgroup</a></code> element, nor a <code>col</code>
+   element.
 
   <p>The <dfn id=createthead
    title=dom-table-createTHead><code>createTHead()</code></dfn> method must
@@ -10483,8 +10493,9 @@ Address: &lt;input name="address"&gt;&lt;/p&gt;</pre>
    href="#table0">table</a></code> element, if any, must be removed, and the
    new value must be inserted immediately before the first element in the
    <code><a href="#table0">table</a></code> element that is neither a
-   <code>caption</code> element, a <code>colgroup</code> element, nor a
-   <code>col</code> element, nor a <code>thead</code> element.
+   <code><a href="#caption1">caption</a></code> element, a <code><a
+   href="#colgroup0">colgroup</a></code> element, nor a <code>col</code>
+   element, nor a <code>thead</code> element.
 
   <p>The <dfn id=createtfoot
    title=dom-table-createTFoot><code>createTFoot()</code></dfn> method must
@@ -10573,6 +10584,77 @@ Address: &lt;input name="address"&gt;&lt;/p&gt;</pre>
    href="#rows">rows</a></code> collection, the method must instead raise an
    <code>INDEX_SIZE_ERR</code> exception.
 
+  <h4 id=the-caption><span class=secno>3.13.2. </span>The <dfn
+   id=caption1><code>caption</code></dfn> element</h4>
+  <!-- element has no special category -->
+
+  <dl class=element>
+   <dt>Contexts in which this element may be used:
+
+   <dd>As the first element child of a <code><a
+    href="#table0">table</a></code> element.
+
+   <dt>Content model:
+
+   <dd><a href="#significant" title="significant inline
+    content">Significant</a> <a href="#strictly">strictly inline-level
+    content</a>.
+
+   <dt>Element-specific attributes:
+
+   <dd>None.
+
+   <dt>DOM interface:
+
+   <dd>No difference from <code><a
+    href="#htmlelement">HTMLElement</a></code>.
+  </dl>
+
+  <p>The <code><a href="#caption1">caption</a></code> element represents the
+   title of the <code><a href="#table0">table</a></code> that is its parent,
+   if it has a parent and that is a <code><a href="#table0">table</a></code>
+   element.
+
+  <h4 id=the-colgroup><span class=secno>3.13.3. </span>The <dfn
+   id=colgroup0><code>colgroup</code></dfn> element</h4>
+  <!-- element has no special category -->
+
+  <dl class=element>
+   <dt>Contexts in which this element may be used:
+
+   <dd>As a child of a <code><a href="#table0">table</a></code> element,
+    before any elements that aren't <code><a
+    href="#caption1">caption</a></code> or <code><a
+    href="#colgroup0">colgroup</a></code> elements.
+
+   <dt>Content model:
+
+   <dd>Zero or more <code>col</code> elements.
+
+   <dt>Element-specific attributes:
+
+   <dd><code title=attr-colgroup-span><a href="#span1">span</a></code>, but
+    only if the element contains no <code>col</code> elements
+
+   <dt>DOM interface:
+
+   <dd>
+    <pre
+     class=idl>interface <dfn id=htmltablecolelement>HTMLTableColElement</dfn> : <a href="#htmlelement">HTMLElement</a> {
+           attribute long <a href="#span2" title=dom-colgroup-span>span</a>;
+};</pre>
+  </dl>
+
+  <p>The <code><a href="#colgroup0">colgroup</a></code> element represents a
+   group of columns in the <code><a href="#table0">table</a></code> that is
+   its parent, if it has a parent and that is a <code><a
+   href="#table0">table</a></code> element.
+
+  <p class=big-issue><dfn id=span1
+   title=attr-colgroup-span><code>span</code></dfn> content attribute and
+   <dfn id=span2 title=dom-colgroup-span><code>span</code></dfn> DOM
+   attribute.
+
   <h3 id=forms><span class=secno>3.14. </span>Forms <a href="#tbw"
    title=TBW>[TBW]</a></h3>
   <!-- XXXX everything in WF2 -->
@@ -23734,7 +23816,8 @@ function receiver(e) {
      <code>basefont</code>, <code>bgsound</code>, <code><a
      href="#blockquote0">blockquote</a></code>, <code><a
      href="#body1">body</a></code>, <code><a href="#br0">br</a></code>,
-     <code>center</code>, <code>col</code>, <code>colgroup</code>, <code><a
+     <code>center</code>, <code>col</code>, <code><a
+     href="#colgroup0">colgroup</a></code>, <code><a
      href="#dd0">dd</a></code>, <code>dir</code>, <code>div</code>, <code><a
      href="#dl0">dl</a></code>, <code><a href="#dt0">dt</a></code>, <code><a
      href="#embed0">embed</a></code>, <code>fieldset</code>,
@@ -23767,7 +23850,8 @@ function receiver(e) {
    <dd>
     <p>The following HTML elements introduce new <a href="#have-an"
      title="has an element in scope">scopes</a> for various parts of the
-     parsing: <code>button</code>, <code>caption</code>, <code><a
+     parsing: <code>button</code>, <code><a
+     href="#caption1">caption</a></code>, <code><a
      href="#html0">html</a></code>, <code>marquee</code>, <code><a
      href="#object0">object</a></code>, <code><a
      href="#table0">table</a></code>, <code>td</code> and <code>th</code>.
@@ -23825,7 +23909,7 @@ function receiver(e) {
      state:</p>
 
     <ul class=brief>
-     <li><code>caption</code>
+     <li><code><a href="#caption1">caption</a></code>
 
      <li><code>td</code>
 
@@ -24070,16 +24154,16 @@ function receiver(e) {
     title="insertion mode: in table body">in table body</a>" and abort these
     steps.
 
-   <li>If <var title="">node</var> is a <code>caption</code> element, then
-    switch the <a href="#insertion0">insertion mode</a> to "<a
-    href="#in-caption" title="insertion mode: in caption">in caption</a>" and
-    abort these steps.
+   <li>If <var title="">node</var> is a <code><a
+    href="#caption1">caption</a></code> element, then switch the <a
+    href="#insertion0">insertion mode</a> to "<a href="#in-caption"
+    title="insertion mode: in caption">in caption</a>" and abort these steps.
 
-   <li>If <var title="">node</var> is a <code>colgroup</code> element, then
-    switch the <a href="#insertion0">insertion mode</a> to "<a
-    href="#in-column" title="insertion mode: in column group">in column
-    group</a>" and abort these steps. (<a
-    href="#innerhtml1"><code>innerHTML</code> case</a>)
+   <li>If <var title="">node</var> is a <code><a
+    href="#colgroup0">colgroup</a></code> element, then switch the <a
+    href="#insertion0">insertion mode</a> to "<a href="#in-column"
+    title="insertion mode: in column group">in column group</a>" and abort
+    these steps. (<a href="#innerhtml1"><code>innerHTML</code> case</a>)
 
    <li>If <var title="">node</var> is a <code><a
     href="#table0">table</a></code> element, then switch the <a
@@ -25734,12 +25818,13 @@ Put the following into the MathML namespace if parsed:
 
         <p><a href="#generate">Generate implied end tags</a>.</p>
 
-        <p>Now, if the <a href="#current3">current node</a> is not a
-         <code>caption</code> element, then this is a <a href="#parse">parse
-         error</a>.</p>
+        <p>Now, if the <a href="#current3">current node</a> is not a <code><a
+         href="#caption1">caption</a></code> element, then this is a <a
+         href="#parse">parse error</a>.</p>
 
-        <p>Pop elements from this stack until a <code>caption</code> element
-         has been popped from the stack.</p>
+        <p>Pop elements from this stack until a <code><a
+         href="#caption1">caption</a></code> element has been popped from the
+         stack.</p>
 
         <p><a href="#clear0">Clear the list of active formatting elements up
          to the last marker</a>.</p>
@@ -25813,8 +25898,8 @@ Put the following into the MathML namespace if parsed:
          href="#innerhtml1"><code>innerHTML</code> case</a>)</p>
 
         <p>Otherwise, pop the <a href="#current3">current node</a> (which
-         will be a <code>colgroup</code> element) from the <a
-         href="#stack">stack of open elements</a>. Switch the <a
+         will be a <code><a href="#colgroup0">colgroup</a></code> element)
+         from the <a href="#stack">stack of open elements</a>. Switch the <a
          href="#insertion0">insertion mode</a> to "<a href="#in-table"
          title="insertion mode: in table">in table</a>".</p>
 

diff --git a/source b/source
@@ -4566,16 +4566,16 @@ http://software.hixie.ch/utilities/js/live-dom-viewer/?%3C%21DOCTYPE%20html%3E..
 
   </dl>
 
-  <p>Unless an element's content model explicitly states that it must
-  contain <span>significant inline content</span>, simply having no
-  text nodes and no elements satisfies an element whose content model
-  is some kind of inline content.</p>
-
   <p>Some elements are defined to have as a content model
   <dfn>significant inline content</dfn>. This means that at least one
   descendant of the element must be <span>significant text</span> or
   <span>embedded content</span>.</p> <!-- XXX links -->
 
+  <p>Unless an element's content model explicitly states that it must
+  contain <span>significant inline content</span>, simply having no
+  text nodes and no elements satisfies an element whose content model
+  is some kind of inline content.</p>
+
   <p><dfn>Significant text</dfn>, for the purposes of determining the
   presence of <span>significant inline content</span>, consists of any
   character other than those falling in the <a
@@ -8892,7 +8892,7 @@ Address: &lt;input name="address"&gt;&lt;/p&gt;</pre>
    followed by either zero or more <code>colgroup</code> elements
    <em>or</em> one or more <code>col</code> elements, followed
    optionally by a <code>thead</code> element, followed optionally by
-   a <code>tfoot</code> element, followed by either zore or more
+   a <code>tfoot</code> element, followed by either zero or more
    <code>tbody</code> elements <em>or</em> one or more
    <code>tr</code> elements, followed optionally by a
    <code>tfoot</code> element (but there can only be one
@@ -9097,6 +9097,57 @@ Address: &lt;input name="address"&gt;&lt;/p&gt;</pre>
   instead raise an <code>INDEX_SIZE_ERR</code> exception.</p>
 
 
+  <h4>The <dfn><code>caption</code></dfn> element</h4>
+
+  <!-- element has no special category -->
+
+  <dl class="element">
+   <dt>Contexts in which this element may be used:</dt>
+   <dd>As the first element child of a <code>table</code> element.</dd>
+   <dt>Content model:</dt>
+   <dd><span title="significant inline content">Significant</span> <span>strictly inline-level content</span>.</dd>
+   <dt>Element-specific attributes:</dt>
+   <dd>None.</dd>
+   <dt>DOM interface:</dt>
+   <dd>No difference from <code>HTMLElement</code>.</dd>
+  </dl>
+
+  <p>The <code>caption</code> element represents the title of the
+  <code>table</code> that is its parent, if it has a parent and that
+  is a <code>table</code> element.</p>
+
+
+  <h4>The <dfn><code>colgroup</code></dfn> element</h4>
+
+  <!-- element has no special category -->
+
+  <dl class="element">
+   <dt>Contexts in which this element may be used:</dt>
+   <dd>As a child of a <code>table</code> element, before any elements
+   that aren't <code>caption</code> or <code>colgroup</code>
+   elements.</dd>
+   <dt>Content model:</dt>
+   <dd>Zero or more <code>col</code> elements.</dd>
+   <dt>Element-specific attributes:</dt>
+   <dd><code title="attr-colgroup-span">span</code>, but only if the element contains no <code>col</code> elements</dd>
+   <dt>DOM interface:</dt>
+   <dd>
+<pre class="idl">interface <dfn>HTMLTableColElement</dfn> : <span>HTMLElement</span> {
+           attribute long <span title="dom-colgroup-span">span</span>;
+};</pre>
+   </dd>
+  </dl>
+
+  <p>The <code>colgroup</code> element represents a group of columns
+  in the <code>table</code> that is its parent, if it has a parent and
+  that is a <code>table</code> element.</p>
+
+  <p class="big-issue"><dfn
+  title="attr-colgroup-span"><code>span</code></dfn> content attribute
+  and <dfn title="dom-colgroup-span"><code>span</code></dfn> DOM
+  attribute.</p>
+
+
 
   <h3>Forms <span title="TBW">[TBW]</span></h3>
   <!-- XXXX everything in WF2 -->